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

Timestamp:

Jun 24, 2009, 11:20:15 AM (17 years ago)

Author:

jhoblitt

Message:

start volume handling refactoring

File:

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

trunk/Nebulous-Server/bin/nebdiskd

@@ -67 +67 @@
 $retry      ||= $c->get_retry   || 1;
 
-my $mounts = $c->get_mounts;
+#my $mounts = $c->get_mounts;
 my $poll_interval = $c->get_poll_interval || 5;
 
@@ -178 +178 @@
     eval {
         my $r_query = $dbh->prepare_cached("REPLACE INTO mount VALUES(?, ?, ?)");
-        my $d_query = $dbh->prepare_cached("DELETE FROM mount WHERE mountpoint = ?");
-
+        my $d_query = $dbh->prepare_cached("DELETE FROM mount, mountedvol WHERE mountpoint = ?");
+
+        # get list of mount points
+        my $mounts = [];
+        {
+            my $query = $dbh->prepared_cached("SELECT mountpoint FROM volume");
+            $query->execute;
+            while (my $row = $query->fetchrow_hashref) {
+                push @$mounts, $row->{'mountpoint'};
+            }
+            $query->finish;
+        }
+        
         # determine valid mountpoints
         foreach my $mnt (@$mounts) {
@@ -212 +223 @@
             }
 
+            # find vol_id(s) for mountpoint
             $r_query->execute($mnt, @$dev_info{qw( blocks used )});
             $log->debug("adding $mnt to db");