Changeset 18463

Timestamp:

Jul 10, 2008, 1:21:27 PM (18 years ago)

Author:

jhoblitt

Message:

retry all calls to open()

Location:

trunk/Nebulous

Files:

• Changes (modified) (1 diff)
• lib/Nebulous/Client.pm (modified) (2 diffs)
• lib/Nebulous/Util.pm (modified) (2 diffs)

trunk/Nebulous/Changes

@@ -1 +1 @@
 Revision history for Nebulous
+
+0.10
+    - retry all calls to open()
 
 0.09 Wed Jul  9 16:36:27 HST 2008

trunk/Nebulous/lib/Nebulous/Client.pm

@@ -1 +1 @@
 # Copyright (c) 2004-2008  Joshua Hoblitt
 #
-# $Id: Client.pm,v 1.56 2008-07-10 02:38:58 jhoblitt Exp $
+# $Id: Client.pm,v 1.57 2008-07-10 23:21:27 jhoblitt Exp $
 
 package Nebulous::Client;
@@ -171 +171 @@
     $log->debug( "URI is: $uri" );
 
-    # XXX this is a attempt to work around some sort of nasty NFS bug where
-    # occasionally stat()/open() on a file on an NFS mounted filesystem will
-    # fail EVEN THOU THE FILE ACTUALLY EXISTS.
-    #
-    #  The instance file attempting to be opened should always exist as it was
-    #  created by the Nebulous server.
     my $fh;
-    for (my $i = 0; $i < 10; $i++) {
-        eval {
-            $fh = _open_uri( $uri, '+<' );
-        };
-        if ($@ =~ qr/file doesn't exist/) {
-            $self->set_err($@);
-            sleep 1;
-        } else {
-            last;
-        }
-    }
+    eval {
+        $fh = _open_uri( $uri, '+<' );
+    };
     $log->logdie( $@ ) if $@;
 

trunk/Nebulous/lib/Nebulous/Util.pm

@@ -1 +1 @@
 # Copyright (c) 2004  Joshua Hoblitt
 #
-# $Id: Util.pm,v 1.12 2008-05-29 03:59:30 jhoblitt Exp $
+# $Id: Util.pm,v 1.13 2008-07-10 23:21:27 jhoblitt Exp $
 
 package Nebulous::Util;
@@ -70 +70 @@
     my ( $path, $flags ) = @_;
 
-    die "can't open file $path: file doesn't exist" 
-        unless -e $path;
-    CORE::open( my $fh, $flags, $path )
-        or die "can't open file $path: $!";
-
+    # XXX this is a attempt to work around some sort of nasty NFS bug where
+    # occasionally stat()/open() on a file on an NFS mounted filesystem will
+    # fail EVEN THOU THE FILE ACTUALLY EXISTS.
+    #
+    # The instance file attempting to be opened should always exist as it was
+    # created by the Nebulous server.
+    my $fh;
+    for (my $i = 0; $i < 60; $i++) {
+        eval {
+            die "can't open file $path: file doesn't exist" 
+                unless -e $path;
+            CORE::open($fh, $flags, $path)
+                or die "can't open file $path: $!";
+        };
+        if ($@ =~ qr/file doesn't exist/) {
+            sleep 1;
+            next;
+        } 
+        if ($@) {
+            die $@;
+        }
+
+        last;
+    }
+    
     return $fh;
 }