Changeset 26679

Timestamp:

Jan 25, 2010, 12:28:09 PM (16 years ago)

Author:

watersc1

Message:

Updated neb-df to report the current usage on allocated volumes as well, as this is in someways the number we actually care about.

Also fixed a bug in the code that's probably been there for a long time.

File:

• trunk/Nebulous/bin/neb-df (modified) (3 diffs)

trunk/Nebulous/bin/neb-df

@@ -44 +44 @@
 my $total_total = 0;
 my $total_used  = 0;
+my $allocated_total = 0;
+my $allocated_used = 0;
 foreach my $row (@$stats) {
     my %vol;
-    @vol{qw(mountpoint total used vol_id name path allocate available xattr)}
+    @vol{qw(mountpoint total used vol_id name host path allocate available xattr)}
         = @$row;
-
-    my $path        = $vol{path};
+    my $path        = $vol{host};
     my $total       = $vol{total};
     $total_total    += $total;
@@ -58 +59 @@
     my $mountpoint  = $vol{mountpoint};
 
+    if ($vol{allocate} == 1) {
+        $allocated_total += $total;
+        $allocated_used += $used;
+    }
     # indicated the part of the nebulous volume name that matches up with a
     # local volume (mountpoint) 
@@ -101 +106 @@
     );
 
+my $allocated_available   = $allocated_total - $allocated_used;
+my $allocated_usedper     = ($allocated_used / $allocated_total) * 100; 
+
+# summary
+printf ("%s\n%20s", "/summmary_of_allocated_volumes", "");
+printf(" %*s %*s %*s %*.0f%% %s\n",
+        9,
+        $allocated_total,
+        9,
+        $allocated_used,
+        9,
+        $allocated_available,
+        3,
+        $allocated_usedper,
+        "/allocated",
+    );
+
 __END__