Changeset 13251 for trunk/Nebulous-Server/bin/nebdiskd

Timestamp:

May 4, 2007, 1:36:46 PM (19 years ago)

Author:

jhoblitt

Message:

rework the getmountedvol() stored procedure to attempt to work around what appears to be some nasty transacational isolation leak throught that was causing getmountedvol() to randomly hang when nebdiskd changed the mount table.

File:

• trunk/Nebulous-Server/bin/nebdiskd (modified) (3 diffs)

trunk/Nebulous-Server/bin/nebdiskd

@@ -3 +3 @@
 # Copyright (C) 2007  Joshua Hoblitt
 # 
-# $Id: nebdiskd,v 1.3 2007-04-25 19:52:49 jhoblitt Exp $
+# $Id: nebdiskd,v 1.4 2007-05-04 23:36:46 jhoblitt Exp $
 
 use strict;
@@ -98 +98 @@
         stat_dirs($mounts);
 
-        my $query = $dbh->prepare_cached("INSERT INTO mount VALUES(?, ?, ?)");
-        $dbh->do("DELETE FROM mount");
-        print "flushed mount table\n" if $debug;
-
-        my $stats = $lxs->get;
-        foreach my $dev (keys %$stats) {
-            my $mnt = $stats->{$dev};
-            my %mount;
-            $query->execute(@$mnt{qw( mountpoint total usage )});
-            print "adding $mnt->{mountpoint} to db\n" if $debug;
+        eval {
+            my $query = $dbh->prepare_cached("INSERT INTO mount VALUES(?, ?, ?)");
+            $dbh->do("DELETE FROM mount");
+
+            print "flushed mount table\n" if $debug;
+
+            my $stats = $lxs->get;
+            foreach my $dev (keys %$stats) {
+                my $mnt = $stats->{$dev};
+                my %mount;
+                $query->execute(@$mnt{qw( mountpoint total usage )});
+                print "adding $mnt->{mountpoint} to db\n" if $debug;
+            }
+
+            $dbh->do("call getmountedvol()");
+
+            $dbh->commit;
+        };
+        if ($@) {
+            $db->rollback;
+            warn $@;
         }
-
-        $dbh->commit;
 
         sleep $poll_interval;
@@ -155 +164 @@
     );
 
-    $dbh->do( $sql->set_transaction_model );
-    $dbh->commit;
+    eval {
+        $dbh->do( $sql->set_transaction_model );
+        $dbh->commit;
+    };
+    if ($@) { 
+        $db->rollback;
+        die $@;
+    }
 
     return $dbh;