Changeset 26874

Timestamp:

Feb 10, 2010, 4:16:41 PM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/20091201/Nebulous

Files:

• bin/neb-df (modified) (3 diffs)
• bin/neb-rm (modified) (4 diffs)
• lib/Nebulous/Client.pm (modified) (3 diffs)

branches/eam_branches/20091201/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__
 

branches/eam_branches/20091201/Nebulous/bin/neb-rm

@@ -19 +19 @@
     $force,
     $move,
+    $invalid,
     $server,
 );
@@ -27 +28 @@
     'force|f'       => \$force,
     'move|m'        => \$move,
+    'invalid|i'     => \$invalid,
     'server|s=s'    => \$server,
 ) || pod2usage( 2 );
@@ -42 +44 @@
 foreach my $key (@ARGV) {
     unless (defined $move) {
-        $neb->delete($key, $force) or warn "failed to delete key: $key";
+        $neb->delete($key, $force,$invalid) or warn "failed to delete key: $key";
     } else {
         $neb->move($key, "${key}.rm") or warn "failed to move key: $key";
@@ -80 +82 @@
 When set, this flag causes C<<key>> to be renamed to C<<key>.rm> instead of
 being deleted.
+
+Optional.
+
+=item * --invalid|-i
+
+When set, unavailable instances of C<<key>> will be removed from the nebulous database.
 
 Optional.

branches/eam_branches/20091201/Nebulous/lib/Nebulous/Client.pm

@@ -755 +755 @@
             optional    => 1,
         },
+        {
+            #find_invalid
+            type        => SCALAR|UNDEF,
+            optional    => 1,
+        },
     );
 
@@ -951 +956 @@
     my $self = shift;
 
-    my ($key, $force) = validate_pos( @_,
+    my ($key, $force, $invalid) = validate_pos( @_,
         {
             type        => SCALAR,
@@ -965 +970 @@
             },
         },
-    );
-
-    $log->debug( "entered - @_" );
-
-    my $locations = $self->find_instances( $key, 'any' );
+        {
+            type        => BOOLEAN,
+            optional    => 1,
+            default     => undef,
+            callbacks   => {
+                'is boolean' => sub {
+                    $_[0] == 0 or $_[0] == 1 or $_[0] == undef;
+                },
+            },
+        },
+    );
+
+    $log->debug( "entered - @_" );
+
+
+    my $locations;
+    if ($invalid) {
+        $locations = $self->find_instances( $key, 'any', 'find them all');
+    }
+    else {
+        $locations = $self->find_instances( $key, 'any' );
+    }
 
     return undef unless $locations;