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

Timestamp:

Jan 15, 2013, 10:59:14 AM (14 years ago)

Author:

Serge CHASTEL

Message:

nebdiskd: Scans /export/<host>.[012] instead of nfs-mounted /data/<host>.[012] (Tag->Trung Merge)

Location:

trunk/Nebulous-Server

Files:

• . (modified) (1 prop)
• bin/nebdiskd (modified) (6 diffs)

trunk/Nebulous-Server/bin/nebdiskd

@@ -20 +20 @@
 
 my (
-    $debug, 
-    $db, 
-    $dbhost, 
-    $dbuser, 
-    $dbpass, 
-    $pidfile, 
-    $stop, 
-    $restart, 
+    $debug,
+    $db,
+    $dbhost,
+    $dbuser,
+    $dbpass,
+    $pidfile,
+    $stop,
+    $restart,
     $verbose,
     $user,
@@ -142 +142 @@
 $SIG{TERM} = sub { unlink_pid_file($pidfile); exit(); };
 $SIG{INT}  = $SIG{TERM};
-$SIG{HUP}  = sub { $c = read_rcfile($rcfile) }; 
+$SIG{HUP}  = sub { $c = read_rcfile($rcfile) };
 
 my $date = localtime();
@@ -205 +205 @@
             $query->finish;
         }
-        
+
         # determine valid mountpoints
         foreach my $mnt (@$mounts) {
             my $mountpoint = $mnt->{'mountpoint'};
-            my $hostname = $mnt->{'host'};
-            my $valid_mountpoint = 1;
+            my $alt_mountpoint = $mountpoint;
+            $alt_mountpoint =~ s/data/export/;
+            my $hostname = $mnt->{'host'};
+            my $valid_mountpoint = 1;
 
             # fetch stats on the device using ssh and df
-            my $dev_info = df_through_ssh($hostname, $mountpoint, 1024);
+            my $dev_info = df_through_ssh($hostname, $alt_mountpoint, 1024);
             unless (defined $dev_info) {
-                $valid_mountpoint = 0;
-                $log->error("can't find device info for $mountpoint");
-                $d_query->execute($mountpoint);
+                $valid_mountpoint = 0;
+                $log->error("can't find device info for $mountpoint / $alt_mountpoint");
+                $d_query->execute($mountpoint);
                 next;
             }
@@ -277 +279 @@
 #        $dbh->commit;
     };
-    if ($@) { 
+    if ($@) {
 #        $dbh->rollback;
         $log->logdie($@);
@@ -361 +363 @@
     $log->debug("Received from ssh = [$df_data]");
     unless ($df_data) {
-        return undef;
+        return undef;
     }
     my @data = split(/:/, $df_data);
@@ -483 +485 @@
 =item * C<NEB_PASS>
 
-Equivalent to --dbpass|-p 
+Equivalent to --dbpass|-p
 
 =back