Changeset 23460

Timestamp:

Mar 20, 2009, 1:54:24 PM (17 years ago)

Author:

jhoblitt

Message:

rework transaction redo loops so labels work correctly

File:

• trunk/Nebulous-Server/lib/Nebulous/Server.pm (modified) (18 diffs)

trunk/Nebulous-Server/lib/Nebulous/Server.pm

@@ -163 +163 @@
 
     my $uri;
-TRANS: do {
+TRANS: while (1) {
         eval {
             {
@@ -237 +237 @@
             $log->logdie("error: $@");
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug("leaving");
@@ -275 +276 @@
     $newkey = parse_neb_key($newkey);
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             # rename storage_object
@@ -300 +301 @@
             $log->logdie("database error: $@");
         }
-    } while $@;
+        last;
+    } 
 
     $log->debug("leaving");
@@ -342 +344 @@
     # key1.swap -> key2
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             {
@@ -395 +397 @@
             $log->logdie("database error: $@");
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug("leaving");
@@ -466 +469 @@
 
     my $uri;
-TRANS: do {
+TRANS: while (1) {
         eval {
             my $so_id;
@@ -523 +526 @@
             }
             $log->debug("rollback");
+            if ($@ =~ /Deadlock found/) {
+                $log->warn("database deadlock retrying transaction: $@");
+                redo TRANS;
+            }
             $log->logdie("error: $@");
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug("leaving");
@@ -565 +573 @@
     my $write_lock;
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             {
@@ -634 +642 @@
             $log->logdie("error: $@");
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug("leaving");
@@ -674 +683 @@
     my $write_lock;
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             {
@@ -746 +755 @@
             $log->logdie("error: $@");
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug( "leaving" );
@@ -788 +798 @@
     $key = parse_neb_key($key);
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             my $query;
@@ -828 +838 @@
             $log->logdie("database error: $@");
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug("leaving");
@@ -957 +968 @@
     $key = parse_neb_key($key);
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             my $query = $db->prepare_cached( $sql->remove_object_xattr );
@@ -981 +992 @@
             $log->logdie("database error: $@");
         }
-    } while ($@);
+        last;
+    } 
 
     $log->debug("leaving");
@@ -1143 +1155 @@
     $log->debug( "entered - @_" );
 
-TRANS: do {
+TRANS: while (1) {
         eval {
             my $so_id;
@@ -1209 +1221 @@
             $log->logdie( "database error: $@" );
         }
-    } while ($@);
+        last;
+    }
 
     $log->debug( "leaving" );