openstack/deb-python-taskflow
Code Issues Proposed changes

Merge "Avoid setting object variables"

Browse Source
This commit is contained in:
Jenkins
2013-10-02 17:36:02 +00:00
committed by Gerrit Code Review
parent 0b3de1c728 cbef0ee286
commit 568c79494c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
taskflow/engines/action_engine/graph_action.py
View File

@@ -119,7 +119,7 @@ class ParallelGraphAction(SequentialGraphAction):
has_failed = threading.Event() has_failed = threading.Event()
deps_lock = threading.RLock() deps_lock = threading.RLock()
deps_counter = self._get_nodes_dependencies_count() deps_counter = self._get_nodes_dependencies_count()
self._future_flow_state = st.SUCCESS was_suspended = threading.Event()
def submit_followups(node): def submit_followups(node):
# Mutating the deps_counter isn't thread safe. # Mutating the deps_counter isn't thread safe.
@@ -146,7 +146,7 @@ class ParallelGraphAction(SequentialGraphAction):
if engine.is_running: if engine.is_running:
action.execute(engine) action.execute(engine)
else: else:
self._future_flow_state = st.SUSPENDED was_suspended.set()
return return
except Exception: except Exception:
# Make sure others don't continue working (although they may # Make sure others don't continue working (although they may
@@ -167,7 +167,7 @@ class ParallelGraphAction(SequentialGraphAction):
# Nothing to execute in the first place # Nothing to execute in the first place
if not deps_counter: if not deps_counter:
return return st.SUCCESS
# Ensure that we obtain the lock just in-case the functions submitted # Ensure that we obtain the lock just in-case the functions submitted
# immediately themselves start submitting there own jobs (which could # immediately themselves start submitting there own jobs (which could
@@ -204,4 +204,7 @@ class ParallelGraphAction(SequentialGraphAction):
elif len(failures) == 1: elif len(failures) == 1:
failures[0].reraise() failures[0].reraise()
return self._future_flow_state if was_suspended.is_set():
return st.SUSPENDED
else:
return st.SUCCESS