Changeset 20202

Timestamp:

Oct 16, 2008, 12:24:39 PM (18 years ago)

Author:

jhoblitt

Message:

call getmountedvol() when changing the volume table

Location:

trunk/Nebulous-Server/bin

Files:

• neb-admin (modified) (2 diffs)
• neb-voladm (modified) (2 diffs)

trunk/Nebulous-Server/bin/neb-admin

@@ -3 +3 @@
 # Copyright (C) 2005-2008  Joshua Hoblitt
 #
-# $Id: neb-admin,v 1.13 2008-10-15 20:58:02 jhoblitt Exp $
+# $Id: neb-admin,v 1.14 2008-10-16 22:24:39 jhoblitt Exp $
 
 use strict;
@@ -199 +199 @@
     exit unless scalar @rows;
 
-    print "replicatePending MULTI\n\n";
+    print "removalPending MULTI\n\n";
 
     foreach my $obj (@rows) {

trunk/Nebulous-Server/bin/neb-voladm

@@ -3 +3 @@
 # Copyright (C) 2008  Joshua Hoblitt
 #
-# $Id: neb-voladm,v 1.9 2008-10-15 20:39:49 jhoblitt Exp $
+# $Id: neb-voladm,v 1.10 2008-10-16 22:24:39 jhoblitt Exp $
 
 use strict;
@@ -86 +86 @@
 
 if (%set) {
-    my ($q, @bind) = sql_interp("UPDATE volume AS v SET", \%set, "WHERE", \%constraint);
-    warn "$q\n" if $debug;
-    my $query = $dbh->prepare($q);
-    $query->execute(@bind);
+    eval {
+        my ($q, @bind) = sql_interp("UPDATE volume AS v SET", \%set, "WHERE", \%constraint);
+        warn "$q\n" if $debug;
+        my $query = $dbh->prepare($q);
+        $query->execute(@bind);
+        $dbh->do("call getmountedvol");
+        $dbh->commit;
+    };
+    if ($@) {
+        $dbh->rollback;
+        die $@;
+    }
 }