openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Use shared '_check' function to check engine stages"

Browse Source
This commit is contained in:
Jenkins
2015-06-06 18:06:56 +00:00
committed by Gerrit Code Review
parent 9091a9ce96 ae6e48fed6
commit 89d54a89dd
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
taskflow/engines/action_engine/engine.py
View File

@@ -82,10 +82,18 @@ class ActionEngine(base.Engine):
self._state_lock = threading.RLock()
self._storage_ensured = False
def _check(self, name, check_compiled, check_storage_ensured):
"""Check (and raise) if the engine has not reached a certain stage."""
if check_compiled and not self._compiled:
raise exc.InvalidState("Can not %s an engine which"
" has not been compiled" % name)
if check_storage_ensured and not self._storage_ensured:
raise exc.InvalidState("Can not %s an engine"
" which has not has its storage"
" populated" % name)
def suspend(self):
if not self._compiled:
raise exc.InvalidState("Can not suspend an engine"
" which has not been compiled")
self._check('suspend', True, False)
self._change_state(states.SUSPENDING)
@property
@@ -216,10 +224,7 @@ class ActionEngine(base.Engine):
@lock_utils.locked
def validate(self):
if not self._storage_ensured:
raise exc.InvalidState("Can not validate an engine"
" which has not has its storage"
" populated")
self._check('validate', True, True)
# At this point we can check to ensure all dependencies are either
# flow/task provided or storage provided, if there are still missing
# dependencies then this flow will fail at runtime (which we can avoid
@@ -263,9 +268,7 @@ class ActionEngine(base.Engine):
@lock_utils.locked
def prepare(self):
if not self._compiled:
raise exc.InvalidState("Can not prepare an engine"
" which has not been compiled")
self._check('prepare', True, False)
if not self._storage_ensured:
# Set our own state to resuming -> (ensure atoms exist
# in storage) -> suspended in the storage unit and notify any