Changeset 19796

Timestamp:

Oct 1, 2008, 10:42:31 AM (18 years ago)

Author:

jhoblitt

Message:

dump Sys::Statistics::Linux::DiskUsage for Filesys::Df in nebdiskd as it's behind the scenes usage of df instead of statfs() was causing lags on hung NFS mounts

Location:

trunk/Nebulous-Server

Files:

• Build.PL (modified) (2 diffs)
• Changes (modified) (1 diff)
• bin/nebdiskd (modified) (4 diffs)

trunk/Nebulous-Server/Build.PL

@@ -19 +19 @@
         'File::Path'            => '1.08',
         'File::Spec'            => 0,
+        'Filesys::Df'           => '0.92',
         'File::Spec::Functions' => 0,
         'File::Temp'            => 0,
@@ -25 +26 @@
         'Params::Validate'      => '0.73',
         'SOAP::Lite'            => '0.69',
-        'Sys::Statistics::Linux::DiskUsage' => '0.02',
         'URI'                   => '1.30',
     },

trunk/Nebulous-Server/Changes

@@ -10 +10 @@
     - fix getmountedvol() stored proc to not add volumes to the mountedvol
       table that are not available
+    - dump Sys::Statistics::Linux::DiskUsage for Filesys::Df in nebdiskd as
+      it's behind the scenes usage of `df` instead of statfs() was causing lags
+      on hung NFS mounts
 
 0.15 Thu Sep 11 13:00:59 HST 2008

trunk/Nebulous-Server/bin/nebdiskd

@@ -3 +3 @@
 # Copyright (C) 2007  Joshua Hoblitt
 # 
-# $Id: nebdiskd,v 1.7 2008-10-01 00:30:53 jhoblitt Exp $
+# $Id: nebdiskd,v 1.8 2008-10-01 20:42:31 jhoblitt Exp $
 
 use strict;
@@ -15 +15 @@
 use File::Mountpoint qw( is_mountpoint );
 use File::Spec;
+use Filesys::Df;
 use Nebulous::Server::SQL;
 use Net::Server::Daemonize qw( daemonize unlink_pid_file );
-use Sys::Statistics::Linux::DiskUsage;
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version );
@@ -95 +95 @@
     my $poll_interval   = $p{poll_interval} || 60;
     my $debug           = $p{debug} || 0;
-
-    my $lxs = Sys::Statistics::Linux::DiskUsage->new;
 
     while (1) {
@@ -137 +135 @@
             # this has to be done AFTER we determine what the valid mountpoints
             # are incase is_mountpoint() invokes the automounter
-            my $stats = $lxs->get;
-            $stats = fix_disk_stats($stats);
-
             foreach my $mnt (@valid_mounts) {
-                my $dev_info = $stats->{$mnt};
+                my $dev_info = df($mnt, 1024);
                 unless (defined $dev_info) {
-                    print "can't find device info for $mnt\n"
-                        if $debug;
+                    print "can't find device info for $mnt\n" if $debug;
                     next;
                 }
-                $query->execute(@$dev_info{qw( mountpoint total usage )});
-                print "adding $dev_info->{mountpoint} to db\n" if $debug;
+                $query->execute($mnt, @$dev_info{qw( blocks used )});
+                print "adding $mnt to db\n" if $debug;
             }