diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-08 19:50:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-08 19:50:14 +0000 |
| commit | 20358b1ff011c73e763aac46e954d432e82c4940 (patch) | |
| tree | 9b44114b4d304990f1aa67eb338b79ece69175fa | |
| parent | 7be8c9873aad6cbbed835d9648bec2caa2ef903a (diff) | |
| parent | 0766397b54e66c550047d6b3743907b09fc9ef7f (diff) | |
| download | taskflow-20358b1ff011c73e763aac46e954d432e82c4940.tar.gz | |
Merge "Use the full 'get_execute_failures' vs the shortname"
| -rw-r--r-- | taskflow/engines/action_engine/engine.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/taskflow/engines/action_engine/engine.py b/taskflow/engines/action_engine/engine.py index 67c3ead..8b0b99f 100644 --- a/taskflow/engines/action_engine/engine.py +++ b/taskflow/engines/action_engine/engine.py @@ -332,12 +332,12 @@ class ActionEngine(base.Engine): if new_state not in self.IGNORABLE_STATES: self._change_state(new_state) if new_state not in self.NO_RERAISING_STATES: - failures = self.storage.get_failures() - more_failures = self.storage.get_revert_failures() - fails = itertools.chain( - six.itervalues(failures), - six.itervalues(more_failures)) - failure.Failure.reraise_if_any(fails) + e_failures = self.storage.get_execute_failures() + r_failures = self.storage.get_revert_failures() + er_failures = itertools.chain( + six.itervalues(e_failures), + six.itervalues(r_failures)) + failure.Failure.reraise_if_any(er_failures) finally: if w is not None: w.stop() |