hcq/openGauss-OM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add timeout error message while killed by signal

Browse Source
This commit is contained in:
zhang_xubo
2023-02-24 17:48:11 +08:00
parent 7346ebfdfb
commit a3b5486ec8
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
script/gspylib/threads/SshTool.py
View File

@ -455,7 +455,8 @@ class SshTool():
dss_cmd = sshCmd.replace('parallelism_flag', dss_cmd = sshCmd.replace('parallelism_flag',
'-H ' + dss_host) '-H ' + dss_host)
status, output = subprocess.getstatusoutput(dss_cmd) status, output = subprocess.getstatusoutput(dss_cmd)
if output.find("Timed out, Killed by signal 9") > 0: # killed by signal 9 or Signals.SIGKILL
if output.find("Timed out, Killed by signal") > 0:
self.timeOutClean(cmd, psshpre, hostList, env_file, self.timeOutClean(cmd, psshpre, hostList, env_file,
parallel_num) parallel_num)
isTimeOut = True isTimeOut = True
@ -475,7 +476,7 @@ class SshTool():
status, output = subprocess.getstatusoutput(sshCmd) status, output = subprocess.getstatusoutput(sshCmd)
# when the pssh is time out, kill parent and child process # when the pssh is time out, kill parent and child process
if not localMode and parallelism: if not localMode and parallelism:
if output.find("Timed out, Killed by signal 9") > 0: if output.find("Timed out, Killed by signal") > 0:
self.timeOutClean(cmd, psshpre, hostList, env_file, self.timeOutClean(cmd, psshpre, hostList, env_file,
parallel_num) parallel_num)
isTimeOut = True isTimeOut = True
@ -616,7 +617,8 @@ class SshTool():
(status, output) = subprocess.getstatusoutput(sshCmd) (status, output) = subprocess.getstatusoutput(sshCmd)
# when the pssh is time out, kill parent and child process # when the pssh is time out, kill parent and child process
if not localMode: if not localMode:
if output.find("Timed out, Killed by signal 9") > 0: # killed by signal 9 or Signals.SIGKILL
if output.find("Timed out, Killed by signal") > 0:
isTimeOut = True isTimeOut = True
self.timeOutClean(cmd, psshpre, hostList, env_file, self.timeOutClean(cmd, psshpre, hostList, env_file,
parallel_num) parallel_num)