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

    push @return, "\tIf maintenance flag is set, no havirt will refuse any actions";
    return join( "\n", @return ) . "\n";
+}
-# find node a domain is on
-# first parameter is the domain name
-# rest of @_ is list of nodes to search
-# if no nodes passed in, will search all known nodes
-# returns first node found with the domain, or an empty string if not found
-# possibly not being used??
-sub findDomain {
-   my $domainName = shift;
-   my @node = @_;
-   my $foundNode = '';
-   unless ( @node ) {
-      @node = keys %{$main::statusDB->{'node'} };
-   }
-   foreach my $thisNode ( @node ) {
-      my $output = `ssh $thisNode 'virsh list'`;
-      return $thisNode if ( $output =~ m/domainName/ );
-   }
-   return '';
-}
 sub list {
    &main::readDB();
    print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
    my @header;
    my @data;
+   my @found;
    foreach my $node ( sort keys %{$main::statusDB->{'nodePopulation'}} ) {
       foreach my $virt (sort keys %{$main::statusDB->{'nodePopulation'}->{$node}->{'running'}} ) {
          unless ( @header ) {
             # if we don't have a header yet, create it from the keys in this one. Assumes every entry has same keys
             @header = sort keys %{ $main::statusDB->{'virt'}->{$virt} };
             unshift @header, 'Domain';
             unshift @header, 'Node';
          } # unless
+         push @found, $virt;
          my @line;
          push @line, $node;
          push @line, $virt;
          foreach my $column ( sort keys %{ $main::statusDB->{'virt'}->{$virt} } ) {
             push @line, $main::statusDB->{'virt'}->{$virt}->{$column};
+         }
          push @data, \@line;
+      }
+   }
+   my @allDomains = keys %{$main::statusDB->{'virt'} };
+   my $notRunning = &main::diffArray( \@allDomains, \@found );
+   my @padding;
+   while ( @padding < @header - 2 ) {
+      push @padding, '';
+   }
+   for ( my $i = 0; $i < @$notRunning; $i++ ) {
+      my @line;
+      push @line, 'Down';
+      push @line, $notRunning->[$i];
+      push @line, @padding;
+      push @data, \@line;
+   }
    return &main::report( \@header, \@data );
+}
 # reread the domain definition file and freshen the database
 sub update {
+   my @requiredFields = ( 'maintenance' );
    &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::DEBUG > 1;
    while ( my $virt = shift ) {
       &parseDomain( $virt );
+      foreach my $field ( @requiredFields ) {
+         $main::statusDB->{'virt'}->{$virt}->{$field} = ''
+            unless defined ( $main::statusDB->{'virt'}->{$virt}->{$field} );
+      } # foreach
    } # while
    &main::writeDB( $main::domainDBName, $main::statusDB->{'virt'} );
    return "Updated\n";
+}
 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::forceScan();
-   &main::readDB();
+   #&main::readDB();
-   for my $myNode ( keys %{$main::statusDB->{'nodePopulation'} } ) {
+   if ( my $foundNode = &main::findDomain( $virt ) ) {
-      die "$virt already running on $myNode, not starting\n" if ( $main::statusDB->{'nodePopulation'}->{$myNode}->{'running'}->{$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::DEBUG > 2;
    my $filename = "$main::confDir/$virt.xml";
    my $command = &main::makeCommand( $node, "virsh create $filename" );
 sub shutdown {
    my $virt = shift;
    my $node = '';
    my $return;
+   # these are replaced by the safer findDomain
-   &main::forceScan();
+   #&main::forceScan();
-   &main::readDB();
+   #&main::readDB();
-   for my $myNode ( keys %{$main::statusDB->{'nodePopulation'} } ) {
+   $node = &main::findDomain( $virt );
-      if ( $main::statusDB->{'nodePopulation'}->{$myNode}->{'running'}->{$virt} ) {
+   die "I could not find the domain $virt running\n" unless $node;
-         $node = $myNode;
-         last;
-      }
-   }
    print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
    die "I can not find $virt on any node\n" unless $node;
    my $command = &main::makeCommand( $node, "virsh shutdown $virt" );
    if ( $main::force ) { # they want us to actually do it
       $return = ( &main::executeAndWait( $command, $node, $virt, 0 ) ? 'Success' : 'Time Out waiting for shutdown');
 sub migrate {
    my ( $virt, $target ) = @_;
    my $return;
    my $node;
+   # these are replaced by the safer findDomain
-   &main::forceScan();
+   #&main::forceScan();
-   &main::readDB();
+   #&main::readDB();
-   for my $myNode ( keys %{$main::statusDB->{'nodePopulation'} } ) {
-      if ( $main::statusDB->{'nodePopulation'}->{$myNode}->{'running'}->{$virt} ) {
-         $node = $myNode;
+   $node = &main::findDomain( $virt );
-         last;
-      }
-   }
    print Dumper( $main::statusDB->{'nodePopulation'} ) if $main::DEBUG > 2;
    die "I can not find $virt on any node\n" unless $node;
+   die "Domain $virt in maintenance mode, can not migrate it\n" if $main::statusDB->{'virt'}->{$virt}->{'maintenance'};
+   die "Node $target in maintenance mode, can not migrate anything to it\n" if $main::statusDB->{'node'}->{$target}->{'maintenance'};
+   die "$virt already on $target\n" if $target eq $node;
    my $command = &main::makeCommand( $node, "virsh migrate --live --persistent --verbose  $virt qemu+ssh://$target/system" );
    if ( $main::force ) { # they want us to actually do it
       $return = ( &main::executeAndWait( $command, $node, $virt, 0 ) ? 'Success' : 'Time Out waiting for shutdown');
       &main::forceScan();
    } else {

Subversion Repositories havirt

(root)/trunk/domain.pm – Rev 17 → 18