xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 17:46:38 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1465 from zet809/fix_issue_1462

Browse Source 
fix issue 1462: bmcsetup hang after commencing transmit of discovery …
This commit is contained in:
Xiaopeng Wang 2016-07-04 14:43:27 +08:00 committed by GitHub
commit f968c75c8d
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4370,7 +4370,7 @@ sub process_request {
}
}
if ($request->{command}->[0] eq "findme") {
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0])) {
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0]) and ($request->{discoverymethod}->[0] ne 'undef')) {
# The findme request had been processed by other module, just return
return;
}

2
xCAT-server/lib/xcat/plugins/hpblade.pm
View File

@ -685,7 +685,7 @@ sub process_request {
}
}
if ($request->{command}->[0] eq "findme") {
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0])) {
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0]) and ($request->{discoverymethod}->[0] ne 'undef')) {
# The findme request had been processed by other module, just return
return;
}

2
xCAT-server/lib/xcat/plugins/profilednodes.pm
View File

@ -1816,7 +1816,7 @@ Usage:
#-------------------------------------------------------
sub findme{
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0])) {
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0]) and ($request->{discoverymethod}->[0] ne 'undef')) {
# The findme request had been processed by other module, just return
return;
}

2
xCAT-server/lib/xcat/plugins/seqdiscovery.pm
View File

@ -54,7 +54,7 @@ sub findme {
my @SEQdiscover = xCAT::TableUtils->get_site_attribute("__SEQDiscover");
my @PCMdiscover = xCAT::TableUtils->get_site_attribute("__PCMDiscover");
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0])) {
if (defined($request->{discoverymethod}) and defined($request->{discoverymethod}->[0]) and ($request->{discoverymethod}->[0] ne 'undef')) {
# The findme request had been processed by other module, just return
return;
}

2
xCAT-server/lib/xcat/plugins/switch.pm
View File

@ -268,7 +268,7 @@ sub process_request {
}
return;
} elsif ($req->{command}->[0] eq 'findme') {
if (defined($req->{discoverymethod}) and defined($req->{discoverymethod}->[0])) {
if (defined($req->{discoverymethod}) and defined($req->{discoverymethod}->[0]) and ($req->{discoverymethod}->[0] ne 'undef')) {
# The findme request had been processed by other module, just return
return;
}

2
xCAT-server/lib/xcat/plugins/typemtms.pm
View File

@ -57,7 +57,7 @@ sub process_request {
my $cb = shift;
my $doreq = shift;
if ($req->{command}->[0] eq 'findme') {
if (defined($req->{discoverymethod}) and defined($req->{discoverymethod}->[0])) {
if (defined($req->{discoverymethod}) and defined($req->{discoverymethod}->[0]) and ($req->{discoverymethod}->[0] ne 'undef')) {
# The findme request had been processed by other module, just return
return;
}

2
xCAT-server/lib/xcat/plugins/zzzdiscovery.pm
View File

@ -18,7 +18,7 @@ sub process_request {
my $doreq = shift;
if ($req->{command}->[0] eq 'findme') {
xCAT::MsgUtils->message("S", "xcat.discovery.zzzdiscovery: ($req->{mtm}->[0]*$req->{serial}->[0]) Finish to process the discovery request");
if (!defined($req->{discoverymethod}) or !defined($req->{discoverymethod}->[0])) {
if (!defined($req->{discoverymethod}) or !defined($req->{discoverymethod}->[0]) or ($req->{discoverymethod}->[0] eq 'undef')) {
my $rsp = {};
$rsp->{error}->[0] = "The discovery request can not be processed";
$cb->($rsp);