From 27cb5857874e42a86b33541a899e1e4328dcc76f Mon Sep 17 00:00:00 2001 From: chenglch Date: Thu, 31 Mar 2016 03:04:45 -0400 Subject: [PATCH] Do not send warning message as the output is complete Although handshake between parent and child process fails due to the heavy IO loading, the message received by parent process is complete as the block operation is used. --- xCAT-server/sbin/xcatd | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd index 7c5dc895c..407d68bee 100644 --- a/xCAT-server/sbin/xcatd +++ b/xCAT-server/sbin/xcatd @@ -1901,21 +1901,13 @@ sub plugin_command { $xcatresponses{xcatresponse}=[]; } } + if ($check_fds->count > 0) { + relay_fds($check_fds,$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}}) != $count) { - send_response(\%xcatresponses,$sock); - $xcatresponses{xcatresponse}=[]; - } - } #while (relay_fds($check_fds,$sock)) {} # restore the old signal