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

Fix blade.pm tolerance in a way more targetted at discovery specifically

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12953 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-05-29 16:07:14 +00:00
parent 994846f2b5
commit 06b056fff6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,6 +42,7 @@ use xCAT::DBobjUtils;
use Getopt::Long;
use xCAT::SvrUtils;
use xCAT::FSPUtils;
my $indiscover=0;
sub handled_commands {
return {
@ -3573,7 +3574,9 @@ sub preprocess_request {
foreach my $node (@$noderange) {
my $ent=$mptabhash->{$node}->[0]; #$mptab->getNodeAttribs($node,['mpa', 'id']);
if (defined($ent->{mpa})) { push @{$mpa_hash{$ent->{mpa}}{nodes}}, $node;}
else {
elsif ($indiscover) {
next;
} else {
$callback->({data=>["no mpa defined for node $node"]});
$request = {};
return;
@ -3843,10 +3846,12 @@ sub process_request {
unless ($request->{cacheonly}->[0] or $macmap{$mac} or $macmaptimestamp > (time() - 20)) { #do not refresh cache if requested not to, if it has an entry, or is recent
%macmap = ();
$macmaptimestamp=time();
$indiscover=1;
foreach (@{preprocess_request(\%invreq,\&fillresps)}) {
%invreq = %$_;
process_request(\%invreq,\&fillresps);
}
$indiscover=0;
}
my $found=0;
if ($mac and $macmap{$mac}) {