Changeset 4638

Timestamp:

Jul 27, 2005, 5:48:41 PM (21 years ago)

Author:

jhoblitt

Message:

->open( $foo, 'write') is not allowed when object has multiple instances

Location:

trunk

Files:

• Nebulous-Server/t/18_client_open.t (modified) (3 diffs)
• Nebulous/lib/Nebulous/Client.pm (modified) (3 diffs)
• Nebulous/t/18_client_open.t (modified) (3 diffs)

trunk/Nebulous-Server/t/18_client_open.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 18_client_open.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 18_client_open.t,v 1.3 2005-07-28 03:48:41 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 7;
+plan tests => 8;
 
 use lib qw( ./t ./lib );
@@ -68 +68 @@
 Test::Nebulous->setup;
 
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+    $neb->replicate( "foo" );
+
+    is( $neb->open( "foo", 'write' ), undef,
+        "write to object with multiple instances" );
+}
+
+Test::Nebulous->setup;
+
 eval {
     my $neb = Nebulous::Client->new(

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.17 2005-07-28 01:40:26 jhoblitt Exp $
+# $Id: Client.pm,v 1.18 2005-07-28 03:48:41 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -161 +161 @@
     }
 
-    my $fh  = $self->open( $key, 'write' );
+    my $fh  = $self->open( $key, 'read' );
     unless ( $fh ) {
         $log->debug( "can't open $key" );
@@ -435 +435 @@
 
     if ( $type eq 'write' ) {
+        my $num_instances = scalar @$locations;
+
+        if ( $num_instances > 1 ) {
+            $log->warn( "write not allowed with multiple instances" );
+            $log->debug( "leaving" );
+            return undef;
+        }
+
         eval {
             $fh = _get_filehandle( $path, '+<' );

trunk/Nebulous/t/18_client_open.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 18_client_open.t,v 1.2 2005-06-30 02:35:06 jhoblitt Exp $
+# $Id: 18_client_open.t,v 1.3 2005-07-28 03:48:41 jhoblitt Exp $
 
 use strict;
@@ -10 +10 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 7;
+plan tests => 8;
 
 use lib qw( ./t ./lib );
@@ -68 +68 @@
 Test::Nebulous->setup;
 
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+    $neb->replicate( "foo" );
+
+    is( $neb->open( "foo", 'write' ), undef,
+        "write to object with multiple instances" );
+}
+
+Test::Nebulous->setup;
+
 eval {
     my $neb = Nebulous::Client->new(