arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

verbose updates for rollupdate

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2394 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
mellor 2008-10-27 17:11:23 +00:00
parent a88662b894
commit a938c10652
4 changed files with 117 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
perl-xCAT/xCAT/Utils.pm
View File

@ -854,7 +854,11 @@ sub runxcmd
$::RUNCMD_RC = 0;
if ($::VERBOSE)
{
xCAT::MsgUtils->message("I", "Running Command: $cmd\n");
if (ref($cmd) eq "HASH") {
xCAT::MsgUtils->message("I", "Running internal xCAT command: $cmd->{command}->[0] ... \n");
} else {
xCAT::MsgUtils->message("I", "Running Command: $cmd\n");
}
}
$::xcmd_outref = [];
my $req;

113
xCAT-server/lib/xcat/plugins/rollupdate.pm
View File

@ -21,7 +21,8 @@ use warnings;
#
# Globals
#
# <none>
$::LOGDIR="/var/log/xcat";
$::LOGFILE="rollupdate.log";
#------------------------------------------------------------------------------
@ -382,6 +383,12 @@ sub rollupdate {
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );
return 1;
}
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Creating update group $ugname with nodes: ";
push @{ $rsp->{data} }, join(',',@{$updategroup{$ugname}});
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
}
foreach my $mgline ( @{ $::FILEATTRS{'mapgroups'} } ) {
@ -397,6 +404,12 @@ sub rollupdate {
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );
return 1;
}
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Creating update group $ugname with nodes: ";
push @{ $rsp->{data} }, join(',',@{$updategroup{$ugname}});
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
}
}
unless (%updategroup) {
@ -456,6 +469,11 @@ sub ll_jobs {
my $updategroup = shift;
my $rc = 0;
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Creating LL job command files ";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
#
# Load job command file template
#
@ -476,11 +494,21 @@ sub ll_jobs {
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );
return 1;
}
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Reading LL job template file $tmpl_file_name ";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
my @lines = <$TMPL_FILE>;
close $TMPL_FILE;
# Query LL for list of machines and their status
my $cmd = "llstatus -r %n %sca 2>/dev/null";
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Running command: $cmd ";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
my @llstatus = xCAT::Utils->runcmd( $cmd, 0 );
if ( $::RUNCMD_RC != 0 ) {
my $rsp;
@ -530,7 +558,7 @@ sub ll_jobs {
return 1;
}
unless ( -d $lljobs_dir ) {
unless ( mkpath($lljobs_dir) ) {
unless ( File::Path::mkpath($lljobs_dir) ) {
my $rsp;
push @{ $rsp->{data} }, "Could not create directory $lljobs_dir";
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );
@ -617,12 +645,22 @@ sub ll_jobs {
xCAT::MsgUtils->message( "E", $rsp, $::CALLBACK );
return 1;
}
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Writing LL job command file $lljob_file ";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
print $JOBFILE @jclines;
close($JOBFILE);
chown( $uid, $gid, $lljob_file );
# Submit LL job
my $cmd = qq~su - $lluser "-c llsubmit $lljob_file"~;
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Running command: $cmd ";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
my @llsubmit = xCAT::Utils->runcmd( "$cmd", 0 );
if ( $::RUNCMD_RC != 0 ) {
my $rsp;
@ -681,6 +719,11 @@ sub ll_jobs {
}
# wait until all the children are finished before returning
foreach my $child (@children) {
if ($::VERBOSE) {
my $rsp;
push @{ $rsp->{data} }, "Waiting for child PID $child to complete ";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
}
waitpid($child,0);
}
}
@ -724,10 +767,22 @@ sub rebootnodes {
my $reboot_request = shift;
my $nodes = $reboot_request->{node};
my $command = $reboot_request->{command}->[0];
my $scheduler = $reboot_request->{arg}->[0];
my $hostlist = $reboot_request->{arg}->[1];
my @reboot_args = @{$reboot_request->{arg}};
my $scheduler = shift @reboot_args;
if (($scheduler eq "-V") || ($scheduler eq "--verbose")) {
$::VERBOSE=1;
$scheduler = shift @reboot_args;
}
my $hostlist = shift @reboot_args;
my $rc;
if ($::VERBOSE) {
unless (-d $::LOGDIR) { File::Path::mkpath($::LOGDIR); }
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." rebootnodes request for $hostlist\n";
close (RULOG);
}
my $client;
if ( defined( $reboot_request->{'_xcat_clienthost'} ) ) {
$client = $reboot_request->{'_xcat_clienthost'}->[0];
@ -756,6 +811,12 @@ sub rebootnodes {
unless ( defined($ent)
&& ( $ent->{appstatus} eq "ROLLUPDATE-update_job_submitted" ) )
{
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Node $node appstatus not in valid state for rolling update\n";
print RULOG "The following nodelist will not be processed:\n $hostlist \n";
close (RULOG);
}
my $rsp;
xCAT::MsgUtils->message(
"S",
@ -771,6 +832,11 @@ sub rebootnodes {
# Query LL for list of machines and their status
my $cmd = "llstatus -r %n %sca 2>/dev/null";
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'$cmd\'\n";
close (RULOG);
}
my @llstatus = xCAT::Utils->runcmd( $cmd, 0 );
my %machines;
foreach my $machineline (@llstatus) {
@ -787,6 +853,11 @@ sub rebootnodes {
&& ( $machines{$node}{'mstatus'} eq "1" ) )
{
my $cmd = "llctl -h $node drain";
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'$cmd\'\n";
close (RULOG);
}
xCAT::Utils->runcmd( $cmd, 0 );
}
}
@ -795,6 +866,11 @@ sub rebootnodes {
# Shutdown the nodes
# FUTURE: Replace if we ever develop cluster shutdown function
my $shutdown_cmd = "shutdown -F &";
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'xdsh $hostlist -v $shutdown_cmd\' \n";
close (RULOG);
}
xCAT::Utils->runxcmd(
{
command => ['xdsh'],
@ -811,6 +887,11 @@ sub rebootnodes {
do {
$alldown = 1;
my $pwrstat_cmd = "rpower $nodelist stat";
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'$pwrstat_cmd\' \n";
close (RULOG);
}
my @pwrstat = xCAT::Utils->runxcmd( $pwrstat_cmd, $::SUBREQ, 0 );
foreach my $pline (@pwrstat) {
my ( $pnode, $pstat ) = split( /\s+/, $pline );
@ -823,6 +904,12 @@ sub rebootnodes {
# node off
if ( $slept >= 300 ) {
my $pwroff_cmd = "rpower $pnode off";
my $pwrstat_cmd = "rpower $nodelist stat";
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'$pwroff_cmd\' \n";
close (RULOG);
}
xCAT::Utils->runxcmd( $pwroff_cmd, $::SUBREQ, 0 );
}
else {
@ -867,19 +954,21 @@ sub rebootnodes {
if ( scalar(@rnetboot_nodes) > 0 ) {
my $rnb_nodelist = join( ',', @rnetboot_nodes );
my $cmd = "rnetboot $rnb_nodelist -f";
if ($::VERBOSE) {
system("date >> /tmp/rollupdate.out");
system("echo running command: $cmd >> /tmp/rollupdate.out");
}
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'$cmd\' \n";
close (RULOG);
}
xCAT::Utils->runxcmd( $cmd, $::SUBREQ, 0 );
}
elsif ( scalar(@rpower_nodes) > 0 ) {
my $rp_nodelist = join( ',', @rpower_nodes );
my $cmd = "rpower $rp_nodelist boot";
if ($::VERBOSE) {
system("date >> /tmp/rollupdate.out");
system("echo running command: $cmd >> /tmp/rollupdate.out");
}
if ($::VERBOSE) {
open (RULOG, ">>$::LOGDIR/$::LOGFILE");
print RULOG localtime()." Running command \'$cmd\' \n";
close (RULOG);
}
xCAT::Utils->runxcmd( $cmd, $::SUBREQ, 0 );
}

2
xCAT-server/share/xcat/rollupdate/ll.tmpl
View File

@ -19,7 +19,7 @@
# @ error = /home/lluser/rollupdate_jobs/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).err
# @ output = /home/lluser/rollupdate_jobs/rollupdate_[[NODESET]].$(Host).$(Cluster).$(Process).out
# @ executable = /opt/xcat/share/xcat/rollupdate/send_reboot_request
# @ arguments = 1 loadleveler [[XCATSERVER]] [[XCATPORT]] [[XNODELIST]]
# @ arguments = 5 loadleveler [[XCATSERVER]] [[XCATPORT]] [[XNODELIST]]
# @ node = [[LLCOUNT]]
# @ tasks_per_node = 1
# @ requirements = (Machine == {[[LLMACHINES]]})

12
xCAT-server/share/xcat/rollupdate/send_reboot_request
View File

@ -23,6 +23,9 @@ where:
drain the schedd on the nodelist. Otherwise, when this job
ends, LL may submit new jobs to the nodes and those jobs will
die when the node is shutdown. Default is 10 minutes.
[--verbose|-V] optional verbose indicator which if set will tell the
xcatd daemon to log status messages in the log file
/var/log/xcat/rollupdate.log on the xCAT management node.
<scheduler> is the job scheduler plugin to be invoked. 'loadleveler' is
currently the only scheduler supported by xCAT.
<xcatserver> is the xcatd service node for the node running this script.
@ -45,6 +48,11 @@ system "date";
my $sleeptime = 60 * ( shift @ARGV );
if ( $sleeptime <= 0 ) { $sleeptime = 600; }
my $scheduler = shift @ARGV;
my $verbose = "";
if ( ($scheduler eq '--verbose') || ($scheduler eq '-V') ) {
$verbose = $scheduler;
$scheduler = shift @ARGV;
}
my $xcatd_server = shift @ARGV;
my $port = shift @ARGV;
my $nodelist = shift @ARGV;
@ -66,8 +74,8 @@ while ( defined( $line = <$remote> ) ) {
print "read from port: $line\n";
if ( $line eq "ready" ) {
system "date";
print "sending: rebootnodes $scheduler $nodelist\n";
print $remote "rebootnodes $scheduler $nodelist\n";
print "sending: rebootnodes $verbose $scheduler $nodelist\n";
print $remote "rebootnodes $verbose $scheduler $nodelist\n";
}
if ( $line eq "done" ) { last; }
}