Changeset 17756

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

Location:

trunk/Nebulous

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Client.pm (modified) (3 diffs)
• t/56_client_find_instances.t (modified) (3 diffs)
• t/57_client_find.t (modified) (6 diffs)

trunk/Nebulous/Changes

@@ -2 +2 @@
 
 0.09
+    - change Nebulous::Client->find() to handle a volume param and to fall back
+      to searching on the ':any' volume if the first search fails
     - change open_create() to attempt to open the instance file 10 times before
       failing

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;

trunk/Nebulous/t/56_client_find_instances.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 56_client_find_instances.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 56_client_find_instances.t,v 1.2 2008-05-20 03:46:11 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 19;
+plan tests => 29;
 
 use lib qw( ./t ./lib );
@@ -74 +74 @@
 
 {
+    # key, volume == undef
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    my $locations = $neb->find_instances( "foo", undef );
+
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # volume/key
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    my $locations = $neb->find_instances( "neb://node01/foo");
+
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # volume/key, volume override
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo", "node01" );
+
+    my $locations = $neb->find_instances( "neb://node01/foo", "node02" );
+
+    is($locations, undef, "no instances on specified volume" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # volume/key, volume override
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo", "node01" );
+
+    my $locations = $neb->find_instances( "neb://node02/foo", ":any" );
+
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    ok( -e _get_file_path( @$locations[0] ), "URI matches file" );
+}
+
+Test::Nebulous->setup;
+
+{
     # key
     my $neb = Nebulous::Client->new(

trunk/Nebulous/t/57_client_find.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 57_client_find.t,v 1.1 2005-12-03 02:52:31 jhoblitt Exp $
+# $Id: 57_client_find.t,v 1.2 2008-05-20 03:46:11 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 4;
+plan tests => 7;
 
 use lib qw( ./t ./lib );
@@ -37 +37 @@
 
 {
+    # key, volume
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    my $uri = $neb->create( "foo", "node01" );
+
+    my $path = $neb->find( "foo", "node01" );
+
+    ok( -e $path, "file exists" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # key, volume does not hold key but this works anyways ans find will fall
+    # back to looking for ":any"
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    my $uri = $neb->create( "foo", "node01" );
+
+    my $path = $neb->find( "foo", "node02" );
+
+    ok( -e $path, "file exists" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # key, volume :any
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    my $uri = $neb->create( "foo", "node01" );
+
+    my $path = $neb->find( "foo", ":any" );
+
+    ok( -e $path, "file exists" );
+}
+
+Test::Nebulous->setup;
+
+{
     my $neb = Nebulous::Client->new(
         proxy => "http://$hostport/nebulous",
@@ -43 +86 @@
     my $path = $neb->find( "foo" );
 
-    ok( ! -e $path, "file doesn't exist" );
+    is($path, undef, "file doesn't exist" );
 }
 
@@ -55 +98 @@
     $neb->find();
 };
-like( $@, qr/1 was expected/, "no params" );
+like( $@, qr/1 - 2 were expected/, "no params" );
 
 Test::Nebulous->setup;
@@ -64 +107 @@
     );
 
-    $neb->find( "foo", "bar" );
+    $neb->find( "foo", "bar", "bong" );
 };
-like( $@, qr/1 was expected/, "too many params" );
+like( $@, qr/1 - 2 were expected/, "too many params" );
 
 Test::Nebulous->cleanup;