diff options
| author | rabi <ramishra@redhat.com> | 2017-08-30 14:41:55 +0530 |
|---|---|---|
| committer | Rodrigo Barbieri <rodrigo.barbieri2010@gmail.com> | 2019-10-25 17:14:45 -0300 |
| commit | e32f0ad30a0a119f491429582ce8c8c47ba7e962 (patch) | |
| tree | 4000b4661a2cdc089594a84777c55678c8a6e311 | |
| parent | 12c721c21c6a499f9b13e05d0873e44155f843f6 (diff) | |
| download | heat-e32f0ad30a0a119f491429582ce8c8c47ba7e962.tar.gz | |
Set stack.thread_group_mgr for cancel_update
In change I84d2b34d65b3ce7d8d858de106dac531aff509b7, we changed to
call self._converge_create_or_update() in a sub-thread. However,
thread_group_mgr is not set for cancel_update (with rollback),
which in turn calls converge_stack.
This patch, however, does not enable the test
test_cancel_update_server_with_port, even though
bug #1607714 is marked as fixed.
Change-Id: Ie674fd556418f6aa8e79654458cbe43648851db2
Closes-Bug: #1713952
(cherry picked from commit 3adca03db643275ffda9c1a3203a6e88d7c9d9e2)
| -rw-r--r-- | heat/engine/service.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index 7423f906b..a8e4d414b 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -1165,6 +1165,7 @@ class EngineService(service.ServiceBase): LOG.info('Starting cancel of updating stack %s', db_stack.name) if current_stack.convergence: + current_stack.thread_group_mgr = self.thread_group_mgr if cancel_with_rollback: func = current_stack.rollback else: |