openstack/python-tripleoclient
Code Issues Proposed changes

Add 2h timeout when waiting for websocket messages on package_update

Browse Source 
This patch adds a mechanism for setting a timeout when waiting for websocket
messages. The package_update workflow itself won't be interrupted. Exception
will indicate that it's still running, but websocket is dead.

Change-Id: I5dc7d43d816d286b1d948fa512fe656f92f9d784
This commit is contained in:
Sergii Golovatiuk 2018-09-21 12:22:09 +02:00 committed by mathieu bultel
parent 87c2877cce
commit a5759bf425
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tripleoclient/workflows/package_update.py
View File

@ -22,6 +22,8 @@ from tripleoclient import utils
from tripleoclient.workflows import base from tripleoclient.workflows import base
_WORKFLOW_TIMEOUT = 120 * 60 # 2h
def update(clients, **workflow_input): def update(clients, **workflow_input):
workflow_client = clients.workflow_engine workflow_client = clients.workflow_engine
@ -35,7 +37,8 @@ def update(clients, **workflow_input):
workflow_input=workflow_input workflow_input=workflow_input
) )
for payload in base.wait_for_messages(workflow_client, ws, execution): for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
assert payload['status'] == "SUCCESS", pprint.pformat(payload) assert payload['status'] == "SUCCESS", pprint.pformat(payload)
orchestration_client = clients.orchestration orchestration_client = clients.orchestration
@ -65,7 +68,8 @@ def get_config(clients, **workflow_input):
workflow_input=workflow_input workflow_input=workflow_input
) )
for payload in base.wait_for_messages(workflow_client, ws, execution): for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
assert payload['status'] == "SUCCESS", pprint.pformat(payload) assert payload['status'] == "SUCCESS", pprint.pformat(payload)
if payload['status'] == 'SUCCESS': if payload['status'] == 'SUCCESS':
@ -88,7 +92,8 @@ def update_ansible(clients, **workflow_input):
for payload in base.wait_for_messages(workflow_client, for payload in base.wait_for_messages(workflow_client,
update_ws, update_ws,
execution): execution,
_WORKFLOW_TIMEOUT):
if payload.get('message'): if payload.get('message'):
pprint.pprint(payload['message'].splitlines()) pprint.pprint(payload['message'].splitlines())
@ -110,7 +115,8 @@ def update_converge_nodes(clients, **workflow_input):
workflow_input=workflow_input workflow_input=workflow_input
) )
for payload in base.wait_for_messages(workflow_client, ws, execution): for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
assert payload['status'] == "SUCCESS", pprint.pformat(payload) assert payload['status'] == "SUCCESS", pprint.pformat(payload)
if payload['status'] == 'SUCCESS': if payload['status'] == 'SUCCESS':
@ -131,7 +137,8 @@ def converge_nodes(clients, **workflow_input):
workflow_input=workflow_input workflow_input=workflow_input
) )
for payload in base.wait_for_messages(workflow_client, ws, execution): for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
assert payload['status'] == "SUCCESS", pprint.pformat(payload) assert payload['status'] == "SUCCESS", pprint.pformat(payload)
orchestration_client = clients.orchestration orchestration_client = clients.orchestration
@ -162,7 +169,8 @@ def ffwd_converge_nodes(clients, **workflow_input):
workflow_input=workflow_input workflow_input=workflow_input
) )
for payload in base.wait_for_messages(workflow_client, ws, execution): for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
assert payload['status'] == "SUCCESS", pprint.pformat(payload) assert payload['status'] == "SUCCESS", pprint.pformat(payload)
if payload['status'] == 'SUCCESS': if payload['status'] == 'SUCCESS':
@ -183,7 +191,8 @@ def run_on_nodes(clients, **workflow_input):
workflow_input=workflow_input workflow_input=workflow_input
) )
for payload in base.wait_for_messages(workflow_client, ws, execution): for payload in base.wait_for_messages(workflow_client, ws, execution,
_WORKFLOW_TIMEOUT):
assert payload['status'] == "SUCCESS", pprint.pformat(payload) assert payload['status'] == "SUCCESS", pprint.pformat(payload)
if payload['status'] == "SUCCESS": if payload['status'] == "SUCCESS":