Changeset 26292 for trunk/Nebulous-Server/bin

Timestamp:

Nov 30, 2009, 1:54:49 PM (17 years ago)

Author:

watersc1

Message:

Nebulous: Implemented a number of bug fixes and modifications to

ensure no loss of data.

• Each volume can now be associated into a cabinet, defining their physical arrangement.
• File creation: new files without a specified volume are created on a random volume from a subset of the N least full.
• Replication: file replication uses the same volume selection method, with the constraints that a copy not be automatically placed on the same volume as another, and that the first copy not be housed within the same volume.
• Cull: instead of removing the first available instance, first attempt to remove an instance on the same volume as another, then attempt to remove an instance in the same cabinet as another, and then remove the first only if those fail.
• Corrected bug that prevented the deletion of an object if it had more than one unavailable instance.
• Fixed nebdiskd to synchronize between volume->mountedvol tables and to properly remove volumes that were no longer accessible.

Location:

trunk/Nebulous-Server/bin

Files:

• neb-cabadd (added)
• neb-voladm (modified) (9 diffs)
• nebdiskd (modified) (4 diffs)

trunk/Nebulous-Server/bin/neb-voladm

@@ -23 +23 @@
     $allocate,
     $available,
+    $mounted,
     $db,
     $dbhost,
@@ -31 +32 @@
     $vname,
     $xattr,
+    $cab_id,
 );
 
@@ -41 +43 @@
     'allocate=i'        => \$allocate,
     'available=i'       => \$available,
+    'mounted'           => \$mounted,
     'db|d=s'            => \$db,
     'debug'             => \$debug,
@@ -48 +51 @@
     'vhost=s'           => \$vhost,
     'vname|n=s'         => \$vname,
+    'cab_id|c=i'        => \$cab_id,
     'xattr=i'           => \$xattr,
 ) || pod2usage( 2 );
@@ -56 +60 @@
 
 # are we listing the volumes or updating?
-if (defined $allocate or defined $available or defined $xattr) {
-    pod2usage( -msg => "Options: --allocate, --available, and --xattr Require options --vhost or --vname", -exitval => 2 )
+if (defined $allocate or defined $available or defined $xattr or defined $cab_id) {
+    pod2usage( -msg => "Options: --allocate, --available, --xattr, and --cab_id Require options --vhost or --vname", -exitval => 2 )
         unless defined $vhost or defined $vname;
     pod2usage( -msg => "Options: --allocate, --available, and --xattr Must be 0 or 1", -exitval => 2)
@@ -84 +88 @@
 $set{'v.available'} = $available if defined $available;
 $set{'v.xattr'} = $xattr if defined $xattr;
+$set{'v.cab_id'} = $cab_id if defined $cab_id;
 
 if (%set) {
@@ -97 +102 @@
         die $@;
     }
+    if ($mounted) {
+        eval {
+            my ($q, @bind) = sql_interp("UPDATE mountedvol AS v SET", \%set, "WHERE", \%constraint);
+            warn "$q\n" if $debug;
+            my $query = $dbh->prepare($q);
+            $query->execute(@bind);
+            $dbh->commit;
+        };
+        if ($@) {
+            $dbh->rollback;
+            die $@;
+        }
+    }
 } 
 
@@ -132 +150 @@
     neb-voladm [--vname <volume name>] [--vhost <volume host>]
     [--allocate <0|1>] [--available <0|1>] [--xattr <0|1>]
+    [--cab_id <cab_id>]
     [--host <database host> ] [--db <database name>]
     [--user <database username>] [--pass <database password>]
@@ -164 +183 @@
 
 Enables/Disables these flags on the storage volume.
+
+Requires either the C<--vname> or c<--vhost> options.
+
+=item * --cab_id <cab_id>
+
+Sets the cabinet id for this storage volume.
 
 Requires either the C<--vname> or c<--vhost> options.

trunk/Nebulous-Server/bin/nebdiskd

@@ -177 +177 @@
 
     eval {
-        my $r_query = $dbh->prepare_cached("REPLACE INTO mountedvol SELECT *, ?, ? FROM volume WHERE mountpoint = ?");
+        my $r_query = $dbh->prepare_cached("REPLACE INTO mountedvol SELECT vol_id,name,host,path,allocate,available,xattr,mountpoint, ?, ? FROM volume WHERE mountpoint = ?");
+#       my $d_query = $dbh->prepare_cached("UPDATE mountedvol SET allocate = ?, available = ? WHERE mountpoint = ?");
         my $d_query = $dbh->prepare_cached("DELETE FROM mountedvol WHERE mountpoint = ?");
 
@@ -185 +186 @@
             # there may be multiple vol_ids per mountpoint but we only need to
             # check each mointpont once
-            my $query = $dbh->prepare_cached("SELECT DISTINCT mountpoint FROM volume WHERE available = 1");
+            my $query = $dbh->prepare_cached("SELECT DISTINCT mountpoint FROM volume");
             $query->execute;
             while (my $row = $query->fetchrow_hashref) {
@@ -200 +201 @@
             # automounter and it fails to mount
             my $tries = 0;
+            my $valid_mountpoint = 1;
             TEST: eval {
                 $tries++;
                 unless (is_mountpoint($mountpoint)) {
-                    $log->warn("$mnt is not a valid mountpoint");
+                    $log->warn("$mountpoint is not a valid mountpoint ($tries)");
+                    $valid_mountpoint = 0;
                 }
             };
-            if ($@) {
+            if (!$valid_mountpoint) {
                 # try is_mountpoint() again if $retry > 1
                 if ($tries < $retry) {
@@ -212 +215 @@
                     goto TEST; 
                 }
-                $log->warn($@);
+                $log->warn("Removing $mountpoint from the mountedvol table ($tries > $retry)");
+ #               $log->warn($@);
+
                 $d_query->execute($mountpoint);
                 next;