xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-17 16:50:22 +00:00
Code Issues Releases Wiki Activity

enhance of fix for issue 4652

Browse Source
This commit is contained in:
ertaozh
2018-01-24 06:50:32 -05:00
parent 4acf102b07
commit 3ebe911473
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@@ -47,6 +47,7 @@ my $bmc_user;
my $bmc_pass;
my $openbmc_user;
my $openbmc_pass;
my $done_num = 0;
$::P9_WITHERSPOON_MFG_ID = "42817";
$::P9_WITHERSPOON_PRODUCT_ID = "16975";
@@ -724,6 +725,12 @@ sub scan_process {
while($children > 0) {
sleep(1);
}
unless ($done_num) {
my %rsp;
$rsp{data} = ["No bmc found.\n"];
xCAT::MsgUtils->message("W", \%rsp, $::CALLBACK);
}
}
else
{
@@ -855,18 +862,12 @@ sub forward_data {
if (!($@ and $@ =~ /^Magic number checking on storable file/)) { #this most likely means we ran over the end of available input
$callback->($responses);
}
my $num = 0;
eval {
$responses = fd_retrieve($cfd);
if ($responses->{data}) {
$num += $responses->{data};
$done_num += $responses->{data};
}
};
unless ($num) {
my %rsp;
$rsp{data} = ["No bmc found.\n"];
xCAT::MsgUtils->message("W", \%rsp, $::CALLBACK);
}
}