Changeset 34943 for trunk/Nebulous-Server/bin/nebdiskd

Timestamp:

Jan 16, 2013, 3:41:12 PM (14 years ago)

Author:

Serge CHASTEL

Message:

Merge tag into trunk

Location:

trunk/Nebulous-Server

Files:

• . (modified) (1 prop)
• bin/nebdiskd (modified) (1 diff)

trunk/Nebulous-Server/bin/nebdiskd

@@ -362 +362 @@
     $df_data =~ s/\s+/:/g;
     $log->debug("Received from ssh = [$df_data]");
+    my %df_info = ();
+    $df_info{"blocks"} = 0;
+    $df_info{"used"} = 0;
     unless ($df_data) {
+        # We cannot connect to the host for some reason However, the
+        # partition can be mounted on some other hosts (in the case of
+        # an original host failure or upgrade for instance) Let's look
+        # for an entry in /etc/autofs/auto.data starting with
+        # <hostname>.[012] If it's in there, return (blocks => 1, used
+        # => 1). The partition is mounted but not available for
+        # replication (since blocks-used = 0 and used/blocks=1=100%).
+        my $partition_name = $mountpoint;
+        $partition_name =~ s/\/export\///;
+        $log->debug("Looking for $partition_name in /etc/autofs/auto.data");
+        open(AUTODATA, "</etc/autofs/auto.data") or die("Can't open /etc/autofs/auto.data");
+        foreach my $line (<AUTODATA>) {
+            if ($line =~ /^$partition_name/) {
+                $log->debug("$partition_name found in /etc/autofs/auto.data");
+                close(AUTODATA);
+                $df_info{"blocks"} = 1;
+                $df_info{"used"} = 1;
+                return \%df_info;
+            }
+        }
+        $log->debug("$partition_name NOT found in /etc/autofs/auto.data");
+        close(AUTODATA);
         return undef;
     }
     my @data = split(/:/, $df_data);
-    my %df_info = ();
     $df_info{"blocks"} = $data[1];
     $df_info{"used"} = $data[2];