Changeset 28794 for branches/eam_branches/ipp-20100621/Nebulous-Server/bin/neb-host

Timestamp:

Jul 30, 2010, 9:31:50 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

File:

• branches/eam_branches/ipp-20100621/Nebulous-Server/bin/neb-host (modified) (6 diffs)

branches/eam_branches/ipp-20100621/Nebulous-Server/bin/neb-host

@@ -16 +16 @@
 use Pod::Usage qw( pod2usage );
 
-my ($host, $state,
+my ($host, $state, $note,
     $db, $dbhost, $dbpass, $dbuser,
     $allocate, $available, $debug);
@@ -51 +51 @@
     'host=s'         => \$host,
     'state=s'        => \$state,
-    
+    'note=s'         => \$note,
     'db=s'           => \$db,
     'dbhost=s'       => \$dbhost,
     'dbuser=s'       => \$dbuser,
     'dbpass=s'       => \$dbpass,
+
     
     ) || pod2usage( 2 );
@@ -101 +102 @@
     $set{'v.allocate'} = $allocate if defined $allocate;
     $set{'v.available'} = $available if defined $available;
-    
+    $set{'v.note'} = $note if defined $note;
+
     eval {
         my ($q, @bind) = sql_interp("UPDATE volume AS v SET", \%set, "WHERE", \%constraint);
@@ -134 +136 @@
 $dbh->commit;
 
-my $format  = "%-15s %-15s %-10s %-10s %-10s %-10s\n";
-my @columns = qw(host name mounted allocate available xattr);
+my $format  = "%-15s %-15s %-7s %-8s %-9s %-5s %s\n";
+my @columns = qw(host name mounted allocate available xattr note);
 printf($format, @columns);
 
 while (my $row = $query->fetchrow_hashref) {
+    unless ((exists($$row{ 'note' })) && (defined($$row{ 'note' }))) {
+        $$row{ 'note' } = '-';
+    }
+
     printf($format, @$row{@columns});
 }
@@ -153 +159 @@
 
     neb-host [<nebulous host> <nebulous state>]
+    [--note '<status note>']
     [--host <nebulous host>] [--state <up|down|repair>]
     [--dbhost <database host>] [--db <database name>]
@@ -168 +175 @@
 =over 4
 
+=item * --note <status note>
+
+Set a status note for the specified volume.
+
 =item * --host <nebulous host>