对发送文件失败增加重试

This commit is contained in:
zhang_xubo
2023-08-23 20:25:03 +08:00
parent a0631842fa
commit d96ffe9612

View File

@ -787,11 +787,13 @@ class SshTool():
targetDir, self.__resultFile) targetDir, self.__resultFile)
(status, output) = subprocess.getstatusoutput(scpCmd) (status, output) = subprocess.getstatusoutput(scpCmd)
# If sending the file fails, we retry after 3s to avoid the # If sending the file fails, we retry 3 * 10s to avoid the
# failure caused by intermittent network disconnection. # failure caused by intermittent network disconnection. such as Broken pipe.
# If the fails is caused by timeout. no need to retry. # If the fails is caused by timeout. no need to retry.
if status != 0 and output.find("Timed out") < 0: max_retry_times = 3
time.sleep(3) while(max_retry_times > 0 and status != 0 and output.find("Timed out") < 0):
max_retry_times -= 1
time.sleep(10)
(status, output) = subprocess.getstatusoutput(scpCmd) (status, output) = subprocess.getstatusoutput(scpCmd)
if status != 0: if status != 0: