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

Fix 4338, remove all of in child process

Browse Source
This commit is contained in:
XuWei 2017-11-21 02:25:28 -05:00
parent a362033084
commit 99faf3ff89
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2342,6 +2342,7 @@ sub rspconfig_sshcfg_response {
xCAT::SvrUtils::sendmsg("Failed to fork child process for rspconfig sshcfg.", $callback, $node);
sleep(1)
} elsif ($child == 0) {
$async->remove_all;
exit(sshcfg_process($node))
} else {
$child_node_map{$child} = $node;
@ -2455,6 +2456,7 @@ sub rspconfig_dump_response {
xCAT::SvrUtils::sendmsg("Failed to fork child process for rspconfig dump download.", $callback, $node);
sleep(1)
} elsif ($child == 0) {
$async->remove_all;
exit(dump_download_process($node))
} else {
$child_node_map{$child} = $node;
@ -2723,6 +2725,7 @@ sub rflash_response {
xCAT::SvrUtils::sendmsg("Failed to fork child process to upload firmware image.", $callback, $node);
sleep(1)
} elsif ($child == 0) {
$async->remove_all;
exit(rflash_upload($node, $callback))
} else {
$child_node_map{$child} = $node;
@ -2886,7 +2889,7 @@ sub rflash_upload {
my $curl_upload_cmd = "curl -b $cjar_id -k -H 'Content-Type: application/octet-stream' -X PUT -T " . $::UPLOAD_FILE . " $request_url/upload/image/";
# Try to login
my $curl_login_result = `$curl_login_cmd`;
my $curl_login_result = `$curl_login_cmd -s`;
my $h = from_json($curl_login_result); # convert command output to hash
if ($h->{message} eq $::RESPONSE_OK) {
# Login successfull, upload the file
@ -2905,7 +2908,7 @@ sub rflash_upload {
xCAT::SvrUtils::sendmsg("Firmware upload successful. Use -l option to list.", $callback, $node);
}
# Try to logoff, no need to check result, as there is nothing else to do if failure
my $curl_logout_result = `$curl_logout_cmd`;
my $curl_logout_result = `$curl_logout_cmd -s`;
}
else {
xCAT::SvrUtils::sendmsg("Failed to upload update file $::UPLOAD_FILE :" . $h->{message} . " - " . $h->{data}->{description}, $callback, $node);