xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-20 02:00:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #105 from bybai/master

Browse Source 
fix : updatestatus is not correct when -F run with -P and -S
This commit is contained in:
Xiaopeng Wang
2015-08-20 16:38:05 +08:00
parent 95086d765a 2cd7ff2983
commit 1c135343c0
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
xCAT-server/lib/xcat/plugins/updatenode.pm
View File

@@ -1358,24 +1358,30 @@ sub updatenode
# if immediate return of status not requested (PCM), then update the DB here
# in one transaction, otherwise it is updated in getdata callback and buildnodestatus
if (!(defined($request->{status})) || ($request->{status} ne "yes")) {
# update the node status, this is done when -F -S -P are run
# make sure the nodes only appear in one array good or bad
&cleanstatusarrays;
# update the node status, this is done when -F -S -P are run
# make sure the nodes only appear in one array good or bad
&cleanstatusarrays;
if(@::SUCCESSFULLNODES)
{
my $stat="synced";
xCAT::TableUtils->setUpdateStatus(\@::SUCCESSFULLNODES, $stat);
my $stat="synced";
xCAT::TableUtils->setUpdateStatus(\@::SUCCESSFULLNODES, $stat);
}
if(@::FAILEDNODES)
{
my $stat="failed";
xCAT::TableUtils->setUpdateStatus(\@::FAILEDNODES, $stat);
my $stat="failed";
xCAT::TableUtils->setUpdateStatus(\@::FAILEDNODES, $stat);
}
}
# -P -S are not run
# -F is run, but there is no syncfiles
if(!(@::SUCCESSFULLNODES || @::FAILEDNODES) && $::NOSYNCFILE)
{
my $stat="synced";
xCAT::TableUtils->setUpdateStatus(\@$nodes,$stat);
}
}
# if site.precreatemypostscripts = not 1 or yes or undefined,
# remove all the
# node files in the noderange in /tftpboot/mypostscripts
@@ -1607,6 +1613,10 @@ sub updatenodesyncfiles
my $localhostname = hostname();
my %syncfile_node = ();
my %syncfile_rootimage = ();
# $::NOSYNCFILE default value is 0
# if there is no syncfiles, set $::NOSYNCFILE=1
$::NOSYNCFILE=0;
# if running -P or -S do not report or no status requested
if ((defined($request->{status})) && ($request->{status} eq "yes")) { # status requested
if (($request->{rerunps} && $request->{rerunps}->[0] eq "yes") ||
@@ -1722,13 +1732,12 @@ sub updatenodesyncfiles
}
}
else
{ # no syncfiles defined
{ # no syncfiles defined
my $rsp = {};
$rsp->{data}->[0] =
"There were no syncfiles defined to process. File synchronization has completed.";
$callback->($rsp);
my $stat="synced";
xCAT::TableUtils->setUpdateStatus(\@$nodes, $stat);
$::NOSYNCFILE=1;
}
# report final status PCM