x/tobiko
Code Issues Proposed changes

Workaround SSH command timeout problems.

Browse Source 
Change-Id: I279566bc2c568d73647217a8b05d5fd8f935847f
This commit is contained in:
Federico Ressi 2019-09-26 08:58:18 +02:00
parent 7e7d193664
commit 44dec46be4
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tobiko/shell/ping/_ping.py
View File

@ -148,6 +148,8 @@ def iter_statistics(parameters=None, ssh_client=None, until=None, check=True,
count = 0
while deadline > 0 and count < parameters.count:
start_time = time.time()
# splitting total timeout interval into smaller deadline intervals will
# cause ping command to be executed more times allowing to handle
# temporary packets routing problems
@ -212,6 +214,15 @@ def iter_statistics(parameters=None, ssh_client=None, until=None, check=True,
RECEIVED: received,
UNRECEIVED: transmitted - received}[until]
enlapsed_time = time.time() - start_time
LOG.debug('Ping execution took %s seconds', enlapsed_time)
if enlapsed_time < deadline:
# Avoid busy waiting when errors happens
sleep_time = deadline - enlapsed_time
LOG.debug('Waiting %s seconds before next ping execution',
sleep_time)
time.sleep(sleep_time)
now = time.time()
deadline = min(int(end_of_time - now), parameters.deadline)
@ -224,9 +235,10 @@ def iter_statistics(parameters=None, ssh_client=None, until=None, check=True,
def execute_ping(parameters, ssh_client=None, check=True):
command = get_ping_command(parameters)
result = sh.execute(command=command,
ssh_client=ssh_client,
timeout=parameters.timeout,
timeout=parameters.deadline + 2.,
expect_exit_status=None)
if check and result.exit_status and result.stderr: