Changeset 23691 for branches/neb_distrib_20081210/Nebulous/bin

Timestamp:

Apr 2, 2009, 3:00:37 PM (17 years ago)

Author:

jhoblitt

Message:

clean up --set_copies functionality

File:

• branches/neb_distrib_20081210/Nebulous/bin/neb-replicate (modified) (3 diffs)

branches/neb_distrib_20081210/Nebulous/bin/neb-replicate

@@ -45 +45 @@
     unless defined $neb;
 
-# XXX if replicate fails, we should still set user.copies (if requested)
-for (my $i = 0; $i < $copies; $i++) {
-    if (defined $volume) {
-        $neb->replicate($key, $volume)
-            or die "failed to replicate Nebulous key: $key";
-    } else {
-        $neb->replicate($key)
-            or die "failed to replicate Nebulous key: $key";
+# if replicate fails, we should still set user.copies (if requested)
+my $replication_problem;
+eval {
+    for (my $i = 0; $i < $copies; $i++) {
+        if (defined $volume) {
+            $neb->replicate($key, $volume)
+                or die "failed to replicate Nebulous key: $key";
+        } else {
+            $neb->replicate($key)
+                or die "failed to replicate Nebulous key: $key";
+        }
     }
+};
+if ($@) {
+    warn $@;
+    $replication_problem = 1;
 }
 
-if (defined $set_copies && $set_copies) {
-    write_xattrs($neb, $key, "user.copies:$set_copies") or die;
+if ($set_copies) {
+    $neb->setxattr($key, "user.copies", $copies, "replace")
+        or die $neb->err;
 }
+
+exit(32) if defined $replication_problem;
 
 __END__
@@ -71 +81 @@
 
     neb-replicate [--server <URL>] [--volume <volume name>]
-                  [--copies <n>] <key>
+                  [--copies <n>] [--set_copies <n>] <key>
 
 =head1 DESCRIPTION
@@ -98 +108 @@
 The number of new replications to create.
 
-Optional.  Defaults to 0.
+Optional.  Defaults to 1.
+
+=item * --set_copies|c <n>
+
+Set the C<user.copies> xattr for this storage object to C<<n>>.
+
+Optional.
 
 =back