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

Merge pull request #757 from chenglch/plugin_wait_issue

Browse Source 
Fix race condition issue when printing message in xcatd
This commit is contained in:
Xiaopeng Wang 2016-03-01 22:21:12 +08:00
commit a3148cfce5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xCAT-server/sbin/xcatd
View File

@ -1897,15 +1897,20 @@ sub plugin_command {
$xcatresponses{xcatresponse}=[];
}
}
if (scalar(@{$xcatresponses{xcatresponse}})) {
send_response(\%xcatresponses,$sock);
$xcatresponses{xcatresponse}=[];
}
if ($check_fds->count > 0) {
my %resp_timeout = ('errorcode'=>[1],
'data'=>["Warning: Process terminated due to IO timeout, the following output may not complete.\n"]);
push @{$xcatresponses{xcatresponse}},\%resp_timeout;
my $count = scalar(@{$xcatresponses{xcatresponse}});
relay_fds($check_fds,$xcatresponses{xcatresponse});
}
if (scalar(@{$xcatresponses{xcatresponse}})) {
send_response(\%xcatresponses,$sock);
$xcatresponses{xcatresponse}=[];
if (scalar(@{$xcatresponses{xcatresponse}}) != $count) {
send_response(\%xcatresponses,$sock);
$xcatresponses{xcatresponse}=[];
}
}
#while (relay_fds($check_fds,$sock)) {}