Merge "Sleep before stopping threads for delete"

2014-07-07 05:13:45 +00:00 · 2014-07-07 05:13:45 +00:00 · 54a90a3cf6
commit 54a90a3cf6
parent af3c236167 cb966ff38a
1 changed files with 3 additions and 0 deletions
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@ -746,6 +746,9 @@ class EngineService(service.Service):

        # Current engine has the lock
        if acquire_result == self.engine_id:
+            # give threads which are almost complete an opportunity to
+            # finish naturally before force stopping them
+            eventlet.sleep(0.2)
            self.thread_group_mgr.stop(stack.id)

        # Another active engine has the lock