Changeset 20134

Timestamp:

Oct 13, 2008, 4:56:30 PM (18 years ago)

Author:

jhoblitt

Message:

change nebdiskd to not do things that might imply a table level lock on the mount table

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• bin/nebdiskd (modified) (4 diffs)

trunk/Nebulous-Server/Changes

@@ -30 +30 @@
       DBH itself; cleanup Nebulous::Server->db()
     - add Nebulous::Server->swap_objects() method
+    - change nebdiskd to not do things that might imply a table level lock on
+      the mount table
 
 0.15 Thu Sep 11 13:00:59 HST 2008

trunk/Nebulous-Server/bin/nebdiskd

@@ -3 +3 @@
 # Copyright (C) 2007  Joshua Hoblitt
 # 
-# $Id: nebdiskd,v 1.11 2008-10-03 21:56:36 jhoblitt Exp $
+# $Id: nebdiskd,v 1.12 2008-10-14 02:56:30 jhoblitt Exp $
 
 use strict;
@@ -124 +124 @@
 
         eval {
-            # empty the mount table
-            $dbh->do("DELETE FROM mount");
-            print "flushed mount table\n" if $debug;
-
-            # repopulate the mount table with all valid mounts that we are
-            # supposed to be watching
-            my $query = $dbh->prepare_cached("INSERT INTO mount VALUES(?, ?, ?)");
+            my $r_query = $dbh->prepare_cached("REPLACE INTO mount VALUES(?, ?, ?)");
+            my $d_query = $dbh->prepare_cached("DELETE FROM mount WHERE mountpoint = ?");
 
             # determine valid mountpoints
@@ -139 +134 @@
                 eval {
                     unless (is_mountpoint($mnt)) {
-                        print "$mnt is not a valid mountpoint\n" if $debug;
-                        next;
+                        die "$mnt is not a valid mountpoint\n";
                     }
                 };
                 if ($@) {
-                    print "$mnt is not a valid mountpoint\n" if $debug;
+                    print $@ if $debug;
+                    $d_query->execute($mnt);
                     next;
                 }
@@ -157 +152 @@
                 }
 
-                $query->execute($mnt, @$dev_info{qw( blocks used )});
+                $r_query->execute($mnt, @$dev_info{qw( blocks used )});
                 print "adding $mnt to db\n" if $debug;