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

defect 4147 - fix prescripts preprocess_request to only process nodes that have prescripts defined

Browse Source
This commit is contained in:
mellor 2014-06-03 11:27:09 -04:00
parent 44452f4cd8
commit 5a52fb253d
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,8 +46,39 @@ sub preprocess_request
#if already preprocessed, go straight to request
if ($req->{_xcatpreprocessed}->[0] == 1) { return [$req]; }
my $nodes = $req->{node};
if (!$nodes) { return;}
my $req_nodes = $req->{node};
if (!$req_nodes) { return;}
my @nodes;
my $command = $req->{command}->[0];
my $column;
if ($command eq 'runbeginpre') { $column = 'begin'; }
elsif ($command eq 'runendpre') { $column = 'end'; }
else { $column = ''; }
# See if anything in the prescripts table for the nodes. If not, skip.
# Nothing to do.
my $tab = xCAT::Table->new('prescripts');
#first check if xcatdefaults entry
if ( $tab->getAttribs({node=>"xcatdefaults"},$column) ) {
# yes - process all nodes
@nodes = @$req_nodes;
} else {
# no xcatdefaults, check for node entries
my $tabdata=$tab->getNodesAttribs($req_nodes,['node', $column]);
if ($tabdata) {
foreach my $node (@$req_nodes) {
if (($tabdata->{$node}) &&
($tabdata->{$node}->[0]) &&
($tabdata->{$node}->[0]->{$column}) ) {
push (@nodes,$node);
}
}
}
}
# if no nodes left to process, we are done
if (! @nodes) { return; }
my $service = "xcat";
my @args=();