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 <shardy@redhat.com>

diff --git a/heat/engine/service.py b/heat/engine/service.py
index 07d9dbbb5aa00d0787e320386d88de29a4ce3522..d5abfec5544e8018c25c2daf762d4cd36bb7483d 100644 (file)
--- 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)