openstack
/
heat
Code Issues Proposed changes

Merge "Ignore spurious nested stack locks in convergence" into stable/queens

This commit is contained in:
Zuul 2018-09-25 19:11:02 +00:00 committed by Gerrit Code Review
parent 75d691a5a1 8341cc3ec3
commit 1599ee9b8f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat/engine/resources/stack_resource.py
View File

@ -443,12 +443,16 @@ class StackResource(resource.Resource):
if status == self.IN_PROGRESS:
return False
elif status == self.COMPLETE:
ret = stack_lock.StackLock.get_engine_id(
self.context, self.resource_id) is None
if ret:
# For operations where we do not take a resource lock
# (i.e. legacy-style), check that the stack lock has been
# released before reporting completeness.
done = (self._should_lock_on_action(expected_action) or
stack_lock.StackLock.get_engine_id(
self.context, self.resource_id) is None)
if done:
# Reset nested, to indicate we changed status
self._nested = None
return ret
return done
elif status == self.FAILED:
raise exception.ResourceFailure(status_reason, self,
action=action)