Skip to content

Fix race when parallel inquiries set the execution status (v2.9.1) #4370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2018
Merged

Fix race when parallel inquiries set the execution status (v2.9.1) #4370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efd88b7
Fix race when parallel inquiries set the execution status
m4dcoder Oct 2, 2018
a3a77e3
Add changelog entry.
Kami Oct 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ Fixed
* Update ``st2-pack-install`` and ``st2 pack install`` command so it works with local git repos
(``file://<path to local git repo>``) which are in a detached head state (e.g. specific revision
is checked out). (improvement) #4366
* Fix a race which occurs when there are multiple concurrent requests to resume a workflow. #4369

2.9.0 - September 16, 2018
--------------------------
Expand Down
8 changes: 6 additions & 2 deletions st2common/st2common/services/workflows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,15 +304,19 @@ def request_resume(ac_ex_db):
raise wf_exc.WorkflowExecutionIsCompletedException(str(wf_ex_db.id))

if wf_ex_db.status in states.RUNNING_STATES:
raise wf_exc.WorkflowExecutionIsRunningException(str(wf_ex_db.id))
msg = '[%s] Workflow execution "%s" is not resumed because it is already active.'
LOG.info(msg, wf_ac_ex_id, str(wf_ex_db.id))
return

conductor = deserialize_conductor(wf_ex_db)

if conductor.get_workflow_state() in states.COMPLETED_STATES:
raise wf_exc.WorkflowExecutionIsCompletedException(str(wf_ex_db.id))

if conductor.get_workflow_state() in states.RUNNING_STATES:
raise wf_exc.WorkflowExecutionIsRunningException(str(wf_ex_db.id))
msg = '[%s] Workflow execution "%s" is not resumed because it is already active.'
LOG.info(msg, wf_ac_ex_id, str(wf_ex_db.id))
return

conductor.request_workflow_state(states.RESUMING)

Expand Down
3 changes: 2 additions & 1 deletion st2tests/integration/orquesta/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ def _wait_for_state(self, ex, states):
if ex.status in action_constants.LIVEACTION_COMPLETED_STATES:
raise Exception(
'Execution is in completed state "%s" and '
'does not match expected state(s).' % ex.status
'does not match expected state(s). %s' %
(ex.status, ex.result)
)
else:
raise
Expand Down