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

fix XCATBYPASS mode for blade commands

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1423 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
linggao 2008-05-16 14:43:46 +00:00
parent 5363b9d024
commit cf40984152
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1341,13 +1341,13 @@ sub preprocess_request {
my $sn = xCAT::Utils->get_ServiceNode(\@mms, $service, "MN");
# build each request for each service node
my @moreinfo=();
foreach my $snkey (keys %$sn)
{
#print "snkey=$snkey\n";
my $reqcopy = {%$request};
$reqcopy->{'_xcatdest'} = $snkey;
my $mms1=$sn->{$snkey};
my @moreinfo=();
my @nodes=();
foreach (@$mms1) {
push @nodes, @{$mpa_hash{$_}{nodes}};
@ -1362,7 +1362,34 @@ sub preprocess_request {
}
sub build_more_info{
my $noderange=shift;
my $callback=shift;
my $mptab = xCAT::Table->new("mp");
my @moreinfo=();
unless ($mptab) {
$callback->({data=>"Cannot open mp table"});
return @moreinfo;
}
my %mpa_hash=();
foreach my $node (@$noderange) {
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 @moreinfo;;
}
if (defined($ent->{id})) { push @{$mpa_hash{$ent->{mpa}}{ids}}, $ent->{id};}
else { push @{$mpa_hash{$ent->{mpa}}{ids}}, "";}
}
foreach (keys %mpa_hash) {
push @moreinfo, "\[$_\]\[" . join(',',@{$mpa_hash{$_}{nodes}}) ."\]\[" . join(',',@{$mpa_hash{$_}{ids}}) . "\]";
}
return \@moreinfo;
}
sub process_request {
$SIG{INT} = $SIG{TERM} = sub {
@ -1388,7 +1415,9 @@ sub process_request {
@exargs = ($request->{arg});
}
my $moreinfo=$request->{moreinfo};
my $moreinfo;
if ($request->{moreinfo}) { $moreinfo=$request->{moreinfo}; }
else { $moreinfo=build_more_info($noderange,$callback);}
if ($command eq "rpower" and grep(/^on|off|boot|reset|cycle$/, @exargs)) {