Changeset 29906 for branches/eam_branches/ipp-20101103/Nebulous

Timestamp:

Dec 3, 2010, 2:35:32 AM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101103/Nebulous

Files:

• Build.PL (modified) (1 diff)
• bin/whichnode (copied) (copied from trunk/Nebulous/bin/whichnode )
• lib/Nebulous/Client.pm (modified) (4 diffs)

branches/eam_branches/ipp-20101103/Nebulous/Build.PL

@@ -122 +122 @@
         bin/neb-touch
         bin/neb-xattr
+        bin/whichnode
     )],
 )->create_build_script;

branches/eam_branches/ipp-20101103/Nebulous/lib/Nebulous/Client.pm

@@ -379 +379 @@
         {
             # volume
-            type        => SCALAR,
+            type        => SCALAR|UNDEF,
             optional    => 1,
         },
@@ -401 +401 @@
         }
 
+        # set the number of user copies to 1 to prevent replication
+        $self->setxattr($key, 'user.copies', 1, 'replace');
+
         if (defined $locations) {
-            my $instances = $self->find_instances($key);
-            if (scalar @$instances < 2) {
-                die "not enough instances";
+            my $instances = $self->find_instances($key, undef, 'find them all');
+            if (scalar @$instances == 1) {
+                # only one instance nothing to do
+                return 0;
+            }
+            if (scalar @$instances == 0) {
+                die "no instances";
             }
             foreach my $victim (@$instances) {
@@ -416 +423 @@
             # start at one so cull() is called one less time then the # of
             # instances
-            if ($stats->[6] < 2) {
-                die "not enough instances";
+            if ($stats->[6] ==  1) {
+                # only one instance nothing to do
+                return 0;
+            }
+            if ($stats->[6] == 0) {
+                die "no instances";
             }
             for (my $i = 1; $i < $stats->[6]; $i++) {
@@ -439 +450 @@
 }
 
+sub storage_object_exists
+{
+    my $self = shift;
+
+    # HI!
+
+    my ($key) = validate_pos(@_,
+        {
+            type => SCALAR,
+        },
+    );
+
+    $log->debug( "entered - @_" );
+
+    my $found = 0;
+    eval {
+        my $objects = $self->find_objects($key);
+        if  ($objects) {
+            $found = (scalar @$objects) > 0;
+        }
+    };
+    if ($@) {
+        if ($@ =~ qr/invalid key/) {
+            $self->set_err($@);
+            return;
+        }
+        $log->logdie($@);
+    }
+
+    $log->debug("leaving");
+
+    return $found;
+}
 
 sub lock