Changeset 24930

Timestamp:

Jul 28, 2009, 11:44:45 AM (17 years ago)

Author:

jhoblitt

Message:

add Nebulous::Client->there_can_be_only_one() method

Location:

trunk/Nebulous

Files:

• Changes (modified) (1 diff)
• MANIFEST (modified) (1 diff)
• lib/Nebulous/Client.pm (modified) (3 diffs)
• lib/Nebulous/Client.pod (modified) (3 diffs)
• t/71_client_there_can_be_only_one.t (added)

trunk/Nebulous/Changes

@@ -7 +7 @@
     - change neb-locate's output seperator to \n
     - add Nebulous::Client->prune() method
+    - add Nebulous::Client->there_can_be_only_one() method
 
 0.10

trunk/Nebulous/MANIFEST

@@ -101 +101 @@
 t/69_client_prune.t
 t/70_neb-ls.t
+t/71_client_there_can_be_only_one.t
 t/90_nebclient.t
 t/TEST.PL

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -360 +360 @@
 
     my $locations;
+    my $removed = 0;
     eval {
         # first - strip off any inaccesible instances
-        $self->prune($key);
+        if (not defined $self->prune($key)) {
+            # use the prune() method to also determine if $key is valid
+            $removed = undef;
+            return;
+        }
 
         # check to see if there is an instance on $vol_name that should be the
@@ -375 +380 @@
                 next if $victim eq $locations->[0];
                 $self->delete_instance($key, $victim);
+                $removed++;
             }
         } else {
             # nuke whatever
-            my @stats = $self->stat($key);
-            foreach (1 .. $stats[6]) {
+            my $stats = $self->stat($key);
+            # start at one so cull() is called one less time then the # of
+            # instances
+            for (my $i = 1; $i < $stats->[6]; $i++) {
                 $self->cull($key);
+                $removed++;
             }
         }
@@ -391 +400 @@
     $log->debug("leaving");
 
-    return $locations->[0];
+    return $removed;
 }
 

trunk/Nebulous/lib/Nebulous/Client.pod

@@ -35 +35 @@
     my $mounts = $neb->mounts();
     my $mode = $neb->chmod( $key, $mode );
-    my $dead = $neb->prune( $key );
+    my $n_dead = $neb->prune( $key );
+    my $n_dead = $neb->there_can_be_only_one( $key, $vol );
 
 =head1 DESCRIPTION
@@ -419 +420 @@
 =back
 
-The number of inaccessible instances removed:
+The number of instances removed.
+
+=item * there_can_be_only_one($key, $vol)
+
+Removes all but one instance of an object and automatically removes any
+inaccessible instances.
+
+=over 4
+
+=item * key
+
+The storage object key (name).
+
+=item * vol
+
+If specified, the only remaining instance will be left on this volume (if an
+instance already exists there).
+
+=back
+
+The number of avaiable instances removed.
 
 =item * mounts()
@@ -479 +500 @@
 =head1 COPYRIGHT
 
-Copyright (C) 2004-2008  Joshua Hoblitt.  All rights reserved.
+Copyright (C) 2004-2009  Joshua Hoblitt.  All rights reserved.
 
 This program is free software; you can redistribute it and/or modify it under