WebSVN – havirt – Diff – /trunk/domain.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 domain;
 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;
    push @return, "\tIf maintenance flag is set, no havirt will refuse any actions";
    return join( "\n", @return ) . "\n";
+}
+# dipslay a list of domains, which node they are on and some information on them
 sub list {
    &main::readDB();
    print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::config->{'flags'}->{'debug'} > 2;
    my @header;
    &main::readDB(1); # loading it for write, so lock
    unless ( @_ ) {
       # they didn't pass in anything, so do everything
       @_ = keys %{ $main::statusDB->{'virt'} }
    } # unless
-   print "Preparing to update " . join( "\n", @_ ) . "\n" if $main::config->{'flags'}->{'debug'} > 1;
+   print "Preparing to update " . join( "\n", @_ ) . "\n"
+      if $main::config->{'flags'}->{'debug'} > 1 or $main::config->{'flags'}->{'verbose'};
-   while ( my $virt = shift ) {
+   while ( my $virt = shift ) { # for every domain they passed in
-      &parseDomain( $virt );
+      &parseDomain( $virt ); # parse it and update definition
-      foreach my $field ( @requiredFields ) {
+      foreach my $field ( @requiredFields ) { # make sure the required fields are in there
          $main::statusDB->{'virt'}->{$virt}->{$field} = ''
             unless defined ( $main::statusDB->{'virt'}->{$virt}->{$field} );
       } # foreach
    } # while
    &main::writeDB( $main::domainDBName, $main::statusDB->{'virt'} );
-   return "Updated\n";
+   return "Domain(s) updated\n";
+}
 # finds one xml value in file.
 # since libvirt does not use good xml which can be parsed by
 # exist, or if force is set, do a dumpxml on the running
 # domain, put it into conf/ and load it.
 sub parseDomain {
    my ($virt, $nodePopulations ) = @_;
    print "Parsing domain $virt in domain.pm:parseDomain\n" if $main::config->{'flags'}->{'debug'};
+   print "\tParsing domain $virt\n" if $main::config->{'flags'}->{'verbose'};
    my @keysToSave = ( 'uuid', 'memory', 'vcpu','vnc' );
    my $filename = "$main::config->{'conf dir'}/$virt.xml";
    my $xml = &getVirtConfig( $virt, $filename );
    my ($param,$value) = &getXMLValue( 'uuid', $xml );
    $main::statusDB->{'virt'}->{$virt}->{'uuid'} = $value;
 # return it.
 sub getVirtConfig {
    my ($virt,$filename) = @_;
    my $return;
    print "In getVirtConfig looking for $virt with file $filename, force is $main::config->{'flags'}->{'yes'}\n" if $main::config->{'flags'}->{'debug'};
-   if ( -f $filename && ! $main::config->{'flags'}->{'yes'}) {
+   if ( -f $filename && ! $main::config->{'flags'}->{'force'}) {
       open XML, "<$filename" or die "Could not read from $filename: $!\n";
       $return = join( '', <XML> );
       close XML;
    } else {
       &main::readDB();
       foreach my $node ( keys %{$main::statusDB->{'nodePopulation'}} ) {
          print "getVirtConfig Looking on $node for $virt\n" if $main::config->{'flags'}->{'debug'} > 1;;
          if ( exists( $main::statusDB->{'nodePopulation'}->{$node}->{'running'}->{$virt} ) ) { # we found it
+            print "Getting copy of XML file for $virt from $node\n" if $main::config->{'flags'}->{'verbose'};
             print "Found $virt on node $node\n" if $main::config->{'flags'}->{'debug'};;
             my $command = &main::makeCommand($node, "virsh dumpxml $virt");
             $return = `$command`;
             print "Writing config for $virt from $node into $filename\n" if $main::config->{'flags'}->{'debug'};
             open XML,">$filename" or die "Could not write to $filename: $!\n";
       } # foreach
    } # if..else
    return $return;
 } # sub getVirtConfig
 # start a domain
 sub start {
    my ( $virt, $node ) = @_;
    my $return;
    $node = `hostname` unless $node;
    chomp $node;
    return "Domain $virt in maintenance mode, can not start\n" if $main::statusDB->{'virt'}->{$virt}->{'maintenance'};
    return "Node $node in maintenance mode, can not start\n" if $main::statusDB->{'node'}->{$node}->{'maintenance'};
-   # these are replaced by the safer findDomain
-   #&main::forceScan();
-   #&main::readDB();
    if ( my $foundNode = &main::findDomain( $virt ) ) {
       die "$virt already running on $foundNode, not starting\n";
+   }
    die "I do not have a definition for $virt\n" unless exists( $main::statusDB->{'virt'}->{$virt} );
    print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::config->{'flags'}->{'debug'} > 2;
    if ( my $error = &main::validateResources( $node, $virt ) ) {
       die $error;
+   }
    my $filename = "$main::config->{'conf dir'}/$virt.xml";
    my $command = &main::makeCommand( $node, "virsh create $filename" );
+   print "Starting $virt on $node\n" if $main::config->{'flags'}->{'verbose'};
-   if ( $main::config->{'flags'}->{'yes'} ) { # we'll actually do it
+   if ( $main::config->{'flags'}->{'dryrun'} ) { # we'll actually do it
+      $return =  $command;;
+   } else {
       $return = ( &main::executeAndWait( $command, $node, $virt, 1 ) ? 'Success' : 'Can not start');
       &main::forceScan();
-   } else {
-      $return =  $command;;
+   }
    return "$return\n";
+}
 sub shutdown {
    my $virt = shift;
    my $node = '';
    my $return;
-   # these are replaced by the safer findDomain
-   #&main::forceScan();
-   #&main::readDB();
    $node = &main::findDomain( $virt );
    die "I could not find the domain $virt running\n" unless $node;
    print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::config->{'flags'}->{'debug'} > 2;
    die "I can not find $virt on any node\n" unless $node;
    my $command = &main::makeCommand( $node, "virsh shutdown $virt" );
+   print "Attempting to shut down $virt currently on $node\n" if $main::config->{'flags'}->{'verbose'};
-   if ( $main::config->{'flags'}->{'yes'} ) { # they want us to actually do it
+   if ( $main::config->{'flags'}->{'dryrun'} ) { # they want us to actually do it
+      $return = $command;
+   } else {
       $return = ( &main::executeAndWait( $command, $node, $virt, 0 ) ? 'Success' : 'Time Out waiting for shutdown');
       &main::forceScan();
-   } else {
-      $return = $command;
+   }
    return "$return\n";
+}
+# Migrate a single domain
+# this is defined in havirt.pm, which is set up to migrate multiple domains
+# but has an entry point here for just one
+# domain is domain to migrate, target is where to put it
 sub migrate {
    my ( $domain, $target ) = @_;
    if ( my $error = &main::validateResources( $target, $domain ) ) {
       die $error;
+   }
       $return++;
+   }
    return $return;
+}
+# print MAC address in the correct format
+# two character hex digits separated by colons, lower case
 sub printMac {
    my $mac = shift;
    my @return;
    my $separator = ':';
    for ( my $i = 0; $i < length( $mac ); $i += 2 ) {
       push @return, substr( $mac, $i, 2 );
+   }
    return join( $separator, @return );
+}
+# generate a random MAC address for new function.
+# NOTE: this is not checked for duplication at this time
 sub makeMac {
    my $numDigits = 12; # 12 hex digits in a mac address
    my $macBaseXen = '00163e'; # Xen has 00:16:3E* assigned to it.
    my $hexDigits = '0123456789abcdef';
+      }
+   }
    return $return;
+}
+# put domain in maintenance mode
+# in maintenance mode, it can not be started, stopped or migrated by havirt
 sub maintenance {
    my ( $domain, $action ) = @_;
    &main::readDB(1);
    if ( $action ) {
       $main::statusDB->{'virt'}->{$domain}->{'maintenance'} = ( lc( $action ) eq 'on' ) ? 1 : 0;

Subversion Repositories havirt

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