Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/Nebulous-Server

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• Nebulous-Server/MANIFEST (modified) (1 diff)
• Nebulous-Server/bin/neb-admin (modified) (5 diffs)
• Nebulous-Server/bin/neb-voladd (modified) (2 diffs)
• Nebulous-Server/docs/c_api.h (deleted)
• Nebulous-Server/docs/install.txt (copied) (copied from trunk/Nebulous-Server/docs/install.txt )
• Nebulous-Server/docs/setup.txt (deleted)
• Nebulous-Server/docs/tmp.txt (deleted)

branches/cnb_branches/cnb_branch_20090301/Nebulous-Server/MANIFEST

@@ -10 +10 @@
 bin/neb-voladd
 bin/nebdiskd
-docs/c_api.h
 docs/database_setup.txt
 docs/design.txt
+docs/install.txt
 docs/requirements.txt
-docs/setup.txt
-docs/tmp.txt
 examples/Makefile
 examples/nebexample.c

branches/cnb_branches/cnb_branch_20090301/Nebulous-Server/bin/neb-admin

@@ -23 +23 @@
     $dbpass,
     $dbuser,
+    $so_id_start,
+    $so_id_range,
     $limit,
     $pending,
@@ -41 +43 @@
     'pendingreplicate|r'    => \$pending,
     'pendingremoval'        => \$removal,
+    'so_id_start=i'         => \$so_id_start,
+    'so_id_range=i'         => \$so_id_range,
     'limit|l=i'             => \$limit,
     'verbose|v'             => \$verbose,
@@ -58 +62 @@
 
 # check to make sure that only one instance of neb-admin is running
+# XXX this implies we should move pending replicate elsewhere
 my $pidfile = '/var/tmp/neb-admin';
 # abort if an instance is already running
@@ -91 +96 @@
     $dbh->do("INSERT INTO myvolume SELECT * FROM volume");
 
+    if (not defined $so_id_start) { $so_id_start = 0; }
+    if (not defined $so_id_range) { $so_id_range = 100000; }
+    my $so_id_end = $so_id_start + $so_id_range;
+
+    # XXX check if so_id_start is beyond MAX(so_id): if so, exit with exit status 10
+    { 
+        my $query = $dbh->prepare("SELECT MAX(so_id) from storage_object");
+        $query->execute;
+        my $answer = $query->fetchrow_arrayref;
+        my $max_so_id = $$answer[0];
+        $query->finish;
+
+        if ($so_id_start > $max_so_id) { 
+            print STDERR "at end of so_id range, reset please\n";
+            exit 10;
+        }
+    }
+        
     my $query = $dbh->prepare(
     "        SELECT
@@ -111 +134 @@
                 USING(vol_id)
             WHERE mymountedvol.available = 1
-    --        WHERE storage_object_xattr.name = 'user.copies'
+            AND storage_object_xattr.name = 'user.copies'
+            AND storage_object.so_id >= $so_id_start
+            AND storage_object.so_id <  $so_id_end
             GROUP BY so_id
             HAVING available_instances < instances OR instances < copies

branches/cnb_branches/cnb_branch_20090301/Nebulous-Server/bin/neb-voladd

@@ -79 +79 @@
 =head1 SYNOPSIS
 
-    neb-voladd --volume <volume name> --uri <volume uri>
+    neb-voladd --vname <volume name> --vhost <host name> --uri <volume uri>
     [--db <database>] [--user <username>] [--pass <password>] [--host <hostname]
 
@@ -92 +92 @@
 =over 4
 
-=item * --volume <volume name>
+=item * --vname <volume name>
 
 Symbolic name of volume being added.
+
+=item * --vhost <host name>
+
+Name of the host that containes the C<URI> of the volume being added. 
 
 =item * --uri|-u <volume uri>