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

fix defect 3461

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@16806 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav
2013-06-27 14:02:14 +00:00
parent 1c027a87d7
commit f4dca63e79
1 changed files with 6 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -493,15 +493,11 @@ sub preprocess_updatenode
# hierarchical scenario inside
if ($::FILESYNC)
{
my $reqcopy = {%$request};
$reqcopy->{FileSyncing}->[0] = "yes";
push @requests, $reqcopy;
$request->{FileSyncing}->[0] = "yes";
}
if ($::SNFILESYNC) # either sync service node
{
my $reqcopy = {%$request};
$reqcopy->{SNFileSyncing}->[0] = "yes";
push @requests, $reqcopy;
$request->{SNFileSyncing}->[0] = "yes";
}
# If -F or -f then, call CFMUtils to check if any PCM CFM data is to be
@@ -529,10 +525,12 @@ sub preprocess_updatenode
}
}
# if not -S or -P or --security
# if not -S or -P or --security, only -F which is always run on the MN
unless (defined($::SWMAINTENANCE) || defined($::RERUNPS) || $::SECURITY)
{
return \@requests;
$request->{_xcatpreprocessed}->[0] = 1;
&updatenode($request, $callback, $subreq);
return;
}
# - need to consider the mixed cluster case
@@ -588,18 +586,6 @@ sub preprocess_updatenode
}
# my @sns = ();
# foreach my $s (keys %$sn)
# {
# my @tmp_a = split(',', $s);
# foreach my $s1 (@tmp_a)
# {
# if (!grep (/^$s1$/, @MNip))
# {
# push @sns, $s1;
# }
# }
# }
if (defined($::SWMAINTENANCE))
{
$request->{swmaintenance}->[0] = "yes";
@@ -1179,13 +1165,6 @@ sub updatenode
$callback->($rsp);
}
my $numberofgoodnodes = 0;
my $numberofbadnodes = 0;
$numberofgoodnodes = @::SUCCESSFULLNODES;
$numberofbadnodes = @::FAILEDNODES;
my $rsp = {};
$rsp->{status}->[0] = "TOTAL NODES: $numberofnodes, SUCCEEDED: $numberofgoodnodes, FAILED: $numberofbadnodes";
$callback->($rsp);
}
# if site.precreatemypostscripts = not 1 or yes or undefined,