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

More fixes to dependency table without preprocess_request() call

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1293 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-05-06 17:56:08 +00:00
parent 7b1ea6f79b
commit c9c71a9cc0
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ my %mm_comm_pids;
use XML::Simple;
if ($^O =~ /^linux/i) {
$XML::Simple::PREFERRED_PARSER='XML::Parser';
$XML::Simple::PREFERRED_PARSER='XML::Parser';
}
use Data::Dumper;
use POSIX "WNOHANG";
@ -1122,9 +1122,35 @@ sub handle_depend {
$req{arg} = [$request->{arg}];
$req{command} = [$request->{command}->[0]];
foreach (@{preprocess_request(\%req,$callback)}) {
process_request(\%$_,$callback,$doreq,1);
#get the MMs for the nodes for the nodes
my $mptab = xCAT::Table->new("mp");
unless ($mptab) {
$callback->({data=>"Cannot open mp table"});
return;
}
my %mpa_hash=();
foreach my $node (keys %$dep) {
my $ent=$mptab->getNodeAttribs($node,['mpa', 'id']);
if (defined($ent->{mpa})) { push @{$mpa_hash{$ent->{mpa}}{nodes}}, $node;}
else {
$callback->({data=>"no mpa defined for node $node"});
return;
}
if (defined($ent->{id})) { push @{$mpa_hash{$ent->{mpa}}{ids}}, $ent->{id};}
else { push @{$mpa_hash{$ent->{mpa}}{ids}}, "";}
}
my @moreinfo=();
my $reqcopy = {%$request};
my @nodes=();
foreach (keys %mpa_hash) {
push @nodes, @{$mpa_hash{$_}{nodes}};
push @moreinfo, "\[$_\]\[" . join(',',@{$mpa_hash{$_}{nodes}}) ."\]\[" . join(',',@{$mpa_hash{$_}{ids}}) . "\]";
}
$reqcopy->{node} = \@nodes;
$reqcopy->{moreinfo}=\@moreinfo;
process_request($reqcopy,$callback,$doreq,1);
my $start = Time::HiRes::gettimeofday();
# build list of dependent nodes w/delays
@ -1312,7 +1338,7 @@ sub process_request {
my $moreinfo=$request->{moreinfo};
if ($command eq "rpower" and grep(/^on|off|boot|reset|cycle$/, @exargs)) {
if ($command eq "rpower" and grep(/^on|off|boot|reset|cycle|stat$/, @exargs)) {
if ( my ($index) = grep($exargs[$_]=~ /^--nodeps$/, 0..$#exargs )) {
splice(@exargs, $index, 1);
} else {
@ -1934,3 +1960,4 @@ sub dompa {