Changeset 24408

Timestamp:

Jun 15, 2009, 12:42:50 PM (17 years ago)

Author:

jhoblitt

Message:

add nebdiskd mountpoint test retyring

Location:

trunk/Nebulous-Server

Files:

• Changes (modified) (1 diff)
• bin/nebdiskd (modified) (4 diffs)

trunk/Nebulous-Server/Changes

@@ -22 +22 @@
     - rename Nebulous::Key->soft_volume Nebulous::Key->hard_volume and invert
       the semantics
+    - add nebdiskd mountpoint test retyring
       
 0.16

trunk/Nebulous-Server/bin/nebdiskd

@@ -139 +139 @@
                 poll_interval   => $poll_interval,
                 debug           => $debug,
+                retry           => 3,
         );
     };
@@ -161 +162 @@
     my $poll_interval   = $p{poll_interval} || 60;
     my $debug           = $p{debug} || 0;
+    my $retry           = $p{retry} || 1;
 
     # setup the db on every pass incase the database died on us
@@ -179 +181 @@
             # this /SHOULD/ fail if the mount point is handled by the
             # automounter and it fails to mount
-            eval {
+            my $tries = 0;
+            TEST: eval {
+                $tries++;
                 unless (is_mountpoint($mnt)) {
                     $log->warn("$mnt is not a valid mountpoint");
@@ -185 +189 @@
             };
             if ($@) {
+                # try is_mountpoint() again if $retry > 1
+                if ($tries < $retry) {
+                    $log->warn("retrying test of $mnt");
+                    goto TEST; 
+                }
                 $log->warn($@);
                 $d_query->execute($mnt);