openstack/heat
Code Issues Proposed changes

Merge "Avoid reference loops in DependencyTaskGroup"

Browse Source
This commit is contained in:
Jenkins 2016-04-01 09:34:17 +00:00 committed by Gerrit Code Review
commit d07845c2a1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
heat/engine/scheduler.py
View File

@ -401,11 +401,14 @@ class DependencyTaskGroup(object):
self.cancel_all()
if raised_exceptions:
if self.aggregate_exceptions:
raise ExceptionGroup(v for t, v, tb in raised_exceptions)
else:
exc_type, exc_val, traceback = raised_exceptions[0]
raise_(exc_type, exc_val, traceback)
try:
if self.aggregate_exceptions:
raise ExceptionGroup(v for t, v, tb in raised_exceptions)
else:
exc_type, exc_val, traceback = raised_exceptions[0]
raise_(exc_type, exc_val, traceback)
finally:
del raised_exceptions
def cancel_all(self, grace_period=None):
for r in six.itervalues(self._runners):