From 75fc3c9bcae6b28c5ff9aa39b2afcd4891b326c4 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Mon, 12 Nov 2012 19:59:58 +0000 Subject: [PATCH] heat engine : Don't wait() for killed greenthreads We don't care about the return value of any killed threads on delete_stack, and the greenthreads will all raise a GreenletExit exception after being kill()'d anyway. Also see related openstack-common fix : https://review.openstack.org/15906 Signed-off-by: Steven Hardy --- heat/engine/service.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/heat/engine/service.py b/heat/engine/service.py index 07d9dbbb..d5abfec5 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -260,10 +260,9 @@ class EngineService(service.Service): stack = parser.Stack.load(context, stack=st) - # TODO Angus do we need a kill or will stop do? + # Kill any pending threads by calling ThreadGroup.stop() if st.id in self.stg: self.stg[st.id].stop() - self.stg[st.id].wait() del self.stg[st.id] # use the service ThreadGroup for deletes self.tg.add_thread(stack.delete) -- 2.45.2