Changeset 17756 for trunk/Nebulous/lib

Timestamp:

May 19, 2008, 5:46:11 PM (18 years ago)

Author:

jhoblitt

Message:

change Nebulous::Client->find() to handle a volume param and to fall back to searching on the ':any' volume if the first search fails

File:

• trunk/Nebulous/lib/Nebulous/Client.pm (modified) (3 diffs)

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.51 2008-05-19 20:52:37 jhoblitt Exp $
+# $Id: Client.pm,v 1.52 2008-05-20 03:46:11 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -671 +671 @@
     my $self = shift;
 
-    my ( $key ) = validate_pos( @_,
+    my ( $key, @params ) = validate_pos( @_,
         {
             type        => SCALAR,
@@ -684 +684 @@
     $log->debug( "entered - @_" );
 
-    my $locations = $self->find_instances( $key, undef );
+    my $locations = $self->find_instances( $key, @params );
+    unless (defined $locations) {
+        unless ($self->err =~ /no instances on storage volume/) {
+            return;
+        }
+
+        # then fall back to looking for isntances on any volume
+        $locations = $self->find_instances( $key, ':any');
+        unless (defined $locations) {
+            return;
+        }
+    }
 
     my $path;