Changeset 24545

Timestamp:

Jun 24, 2009, 3:35:31 PM (17 years ago)

Author:

jhoblitt

Message:

add --mountpoint param to neb-voladd

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• bin/neb-voladd (modified) (5 diffs)
• lib/Nebulous/Server/SQL.pm (modified) (1 diff)
• t/03_server_setup.t (modified) (1 diff)

trunk/Nebulous-Server/Changes

@@ -28 +28 @@
     - completely rework how mountedvol is populated, drop mount table
     - infinitely try to get a db handle if the connection fails
+    - add --mountpoint param to neb-voladd
       
 0.16

trunk/Nebulous-Server/bin/neb-voladd

@@ -19 +19 @@
 use Pod::Usage qw( pod2usage );
 
-my ($db, $dbhost, $dbuser, $dbpass, $vname, $vhost, $uri);
+my ($db, $dbhost, $dbuser, $dbpass, $mountpoint, $vname, $vhost, $uri);
 
 $db     = $ENV{'NEB_DB'} unless $db;
@@ -29 +29 @@
     'db|d=s'            => \$db,
     'host=s'            => \$dbhost,
+    'mountpoint|m=s'    => \$mountpoint,
+    'pass|p=s'          => \$dbpass,
+    'uri|u=s'           => \$uri,
     'user|u=s'          => \$dbuser,
-    'pass|p=s'          => \$dbpass,
+    'vhost=s'           => \$vhost,
     'vname|n=s'         => \$vname,
-    'vhost=s'           => \$vhost,
-    'uri|u=s'           => \$uri,
 ) || pod2usage( 2 );
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
-pod2usage( -msg => "Required options: --db --user --pass --vname --vhost --uri", -exitval => 2 )
-    unless $db && $dbuser && $dbpass && $vname && $vhost && $uri;
+pod2usage( -msg => "Required options: --db --user --pass --mountpoint --vname --vhost --uri", -exitval => 2 )
+    unless $db && $dbuser && $dbpass && $mountpoint && $vname && $vhost && $uri;
 
 my $dbh = DBI->connect(
@@ -59 +60 @@
     die "path: $path dirived from URI: $uri does not exist";
 }
+unless (-d $mountpoint) {
+    die "path: $mountpoint does not exist";
+}
 
 print " OK\n";
@@ -65 +69 @@
 
 my $query = $dbh->prepare( $sql->new_volume );
-$query->execute( $vname, $vhost, $path );
+$query->execute( $vname, $vhost, $path, $mountpoint);
 
 print " OK\n";
@@ -128 +132 @@
 Optional.  Defaults to C<localhost>.
 
+=item * --mountpoint <path>
+
+Path to the mountpoint of the filesystem on which C<--uri> resides.
 
 =back

trunk/Nebulous-Server/lib/Nebulous/Server/SQL.pm

@@ -286 +286 @@
     },
     new_volume          => qq{
-        INSERT INTO volume (name, host, path, allocate, available, xattr)
-        VALUES (?, ?, ?, TRUE, TRUE, FALSE)
+        INSERT INTO volume (name, host, path, allocate, available, xattr, mountpoint)
+        VALUES (?, ?, ?, TRUE, TRUE, FALSE, ?)
     },
     get_volume_by_name => qq{

trunk/Nebulous-Server/t/03_server_setup.t

@@ -30 +30 @@
 
 Test::Nebulous->setup;
+die;
 
 {