WebSVN – havirt – Diff – /trunk/node.pm

 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 # OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 # v0.0.1 20240602 RWR
 # Initial setup
+#
+# v1.2.0 20240826 RWR
+# Added some code to migrate domains if node placed in maintenance mode
+# Added a lot of 'verbose' print lines, and modified for new flag structure
+#
 package node;
 use warnings;
 use strict;
 # define the version number
 # see https://metacpan.org/pod/release/JPEACOCK/version-0.97/lib/version.pod
 use version;
-our $VERSION = version->declare("1.0.0");
+our $VERSION = version->declare("1.2.0");
 use Data::Dumper;
 use Exporter;
 # first defined, or if there is a hardware upgrade
 # reads information off of the stack (@_), but will add to that if --target
 # was defined
 sub update {
    &main::readDB( 1 ); # open and lock so we can write to it later
-   my $return;
+   my @return;
    my @requiredFields = ( 'maintenance' );
    my @targets;
    if ( $main::config->{'flags'}->{'target'} ) {
       push @_, $main::config->{'flags'}->{'target'};
+   }
    @_ = keys %{$main::statusDB->{'node'}} unless @_;
    while ( my $nodename = shift  ) {
-      print "Updating $nodename\n" if $main::config->{'flags'}->{'debug'};
+      print "Updating $nodename\n" if $main::config->{'flags'}->{'debug'} || $main::config->{'flags'}->{'verbose'};
       my $command = &main::makeCommand($nodename, "virsh nodeinfo" );
+      if ( $main::config->{'flags'}->{'dryrun'} ) {
+         push @return, $command;
+      } else {
-      $return = `$command`;
+         my $return, `$command`;
-      print "Output of [$command] is\n" . $return if $main::config->{'flags'}->{'debug'};
+         print "Output of [$command] is\n" . $return if $main::config->{'flags'}->{'debug'};
-      my @nodeinfo = split( "\n", $return );
+         my @nodeinfo = split( "\n", $return );
-      for ( my $i = 0; $i < @nodeinfo; $i++ ) {
+         for ( my $i = 0; $i < @nodeinfo; $i++ ) {
-         my ($key, $value) = split( /:\s+/, $nodeinfo[$i] );
+            my ($key, $value) = split( /:\s+/, $nodeinfo[$i] );
-         if ( $value =~ m/^(\d+)\s+[a-z]+$/i ) {
+            if ( $value =~ m/^(\d+)\s+[a-z]+$/i ) {
-            $value = $1;
+               $value = $1;
-         }
+            }
-         $key = $conversion{$key} if exists( $conversion{$key} );
+            $key = $conversion{$key} if exists( $conversion{$key} );
-         $main::statusDB->{'node'}->{$nodename}->{$key} = $value;
+            $main::statusDB->{'node'}->{$nodename}->{$key} = $value;
-      } # for
+         } # for
-      foreach my $field ( @requiredFields ) {
+         foreach my $field ( @requiredFields ) {
-         $main::statusDB->{'node'}->{$nodename}->{$field} = ''
+            $main::statusDB->{'node'}->{$nodename}->{$field} = ''
-            unless defined ( $main::statusDB->{'node'}->{$nodename}->{$field} );
+               unless defined ( $main::statusDB->{'node'}->{$nodename}->{$field} );
-      } # foreach
+         } # foreach
+      }
    } # while
    print "main::statusDB->{'node'} state after update\n" . Dumper( $main::statusDB->{'node'} ) if $main::config->{'flags'}->{'debug'};
    &main::writeDB();
-   return "Node has been updated\n";
+   return "Node has been updated\n" . join( "\n", @return ) . "\n";
+}
 # check one or more nodes and determine which domains are running on them.
 # defaults to everything in the node database, but the -t can have it run on only one
+}
 # add a new node. This is the same as doing an update on a node that doesn't exist.
 sub add {
-#   &main::readDB();
-#   print "Adding $main::config->{'flags'}->{'target'} as new node\n" if $main::config->{'flags'}->{'debug'};
-#   $main::statusDB->{'node'}->{$main::config->{'flags'}->{'target'}} = '';
-#   print "Calling update for new node\n" if $main::config->{'flags'}->{'debug'};
    &update( @_ );
+}
 # put node in maintenance mode
 # if there are running domains on it, migrate them off first
    my @return;
    if ( $action ) {
       if ( lc ( $action ) eq 'on' ) {
          if ( $main::statusDB->{'nodePopulation'}->{$node}->{'running'} ) {
             # we've requested maintenance mode, but there are domains running on the node
+            print "Trying to migrate domains off of $node before doing maintenance\n" if $main::config->{'flags'}->{'verbose'};
             push @return, &migrateAllDomains( $node, $main::config->{'flags'}->{'target'}, keys %{$main::statusDB->{'nodePopulation'}->{$node}->{'running'}} );
+         }
          if ( $main::statusDB->{'nodePopulation'}->{$node}->{'running'} ) {
             push @return,  "Can not mark $node in maintenance mode with running domains";
          } else {
+            print "Marking $node as under maintenance\n" if $main::config->{'flags'}->{'verbose'};
             $main::statusDB->{'node'}->{$node}->{'maintenance'} = 1;
+         }
       } else {
+         print "Marking $node as Online\n" if $main::config->{'flags'}->{'verbose'};
-         $main::statusDB->{'node'}->{$node}->{'maintenance'} = 1;
+         $main::statusDB->{'node'}->{$node}->{'maintenance'} = 0;
+      }
+   }
    &main::writeDB();
    return "Maintenance set to " . ( $main::statusDB->{'node'}->{$node}->{'maintenance'} ? 'On' : 'Off' ) . "\n" .
           ( @return ? join( "\n", @return ) . "\n" : '');
    my $from = shift;
    my $to = shift;
    print "In node.pm:migrateAllDomains, migrating\n" . join( "\n", @_ ) . "\nto $to\n"
       if ( $main::config->{'flags'}->{'debug'} );
    my @commands;
+   print "Checking for available resources on $to before migrating\n"  if $main::config->{'flags'}->{'verbose'};
    if ( my $error = &main::validateResources( $to, @_ ) ) {
       return "We can not migrate all of the domains on $from to $to\n$error\n";
+   }
    while ( my $domain = shift ) {
       push @commands, &main::migrate( $domain, $to );

Subversion Repositories havirt

(root)/trunk/node.pm – Rev 25 → 26