Index: trunk/Nebulous-Server/lib/Nebulous/Server.pm
===================================================================
--- trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 24546)
+++ trunk/Nebulous-Server/lib/Nebulous/Server.pm	(revision 24547)
@@ -31,6 +31,8 @@
 __PACKAGE__->mk_accessors(qw( log sql config cache ));
 
-use constant SUBPATH_DEPTH  => 2;
-use constant NFS_RETRIES    => 100;
+use constant SUBPATH_DEPTH  	=> 2;
+use constant NFS_RETRIES    	=> 100;
+use constant NFS_RETRY_WAIT 	=> 1;
+use constant TRANS_RETRY_WAIT 	=> 1;
 
 # transaction restart/retry regex
@@ -168,5 +170,5 @@
             if ($@ =~ qr/Can't connect to MySQL server/) {
                 $log->warn("database error, retrying transaction: $@");
-                sleep 1;
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -330,4 +332,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -456,4 +459,5 @@
                 $log->warn("database error, retrying transaction: $@");
                 $parent_id = 1;
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -461,4 +465,5 @@
                 $log->warn("Duplicate database entry, retrying transaction: $@");
                 $parent_id = 1;
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -541,4 +546,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -655,4 +661,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -810,4 +817,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -937,4 +945,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -1054,4 +1063,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -1145,4 +1155,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -1330,4 +1341,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -1658,4 +1670,5 @@
             if ($@ =~ $trans_regex) {
                 $log->warn("database error, retrying transaction: $@");
+                sleep TRANS_RETRY_WAIT;
                 redo TRANS;
             }
@@ -2186,5 +2199,5 @@
         if ($@) {
             $log->logdie($@);
-            sleep 1;
+            sleep NFS_RETRY_WAIT;
             next;
         }