openstack
/
heat
Code Issues Proposed changes

Release stack lock after export stack 

Change-Id: I69e3c8f20530a538bd39f3bc13cd86c923ce8f8f
Closes-Bug: #1664159
This commit is contained in:
huangtianhua 2017-02-13 18:01:08 +08:00
parent 48ef79c5f7
commit 736be1fe27
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
heat/engine/service.py
View File

@ -1498,20 +1498,25 @@ class EngineService(service.ServiceBase):
if not cfg.CONF.enable_stack_abandon:
raise exception.NotSupported(feature='Stack Abandon')
def _stack_abandon(stk, abandon):
if abandon:
LOG.info('abandoning stack %s', stk.name)
stk.delete(abandon=abandon)
else:
LOG.info('exporting stack %s', stk.name)
st = self._get_stack(cnxt, stack_identity)
stack = parser.Stack.load(cnxt, stack=st)
lock = stack_lock.StackLock(cnxt, stack.id, self.engine_id)
with lock.thread_lock():
# Get stack details before deleting it.
stack_info = stack.prepare_abandon()
if abandon:
LOG.info('abandoning stack %s', st.name)
self.thread_group_mgr.start_with_acquired_lock(stack,
lock,
stack.delete,
abandon=True)
else:
LOG.info('exporting stack %s', st.name)
self.thread_group_mgr.start_with_acquired_lock(stack,
lock,
_stack_abandon,
stack,
abandon)
return stack_info
def list_resource_types(self,