From 3adca03db643275ffda9c1a3203a6e88d7c9d9e2 Mon Sep 17 00:00:00 2001 From: rabi Date: Wed, 30 Aug 2017 14:41:55 +0530 Subject: [PATCH] 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 also enables test_cancel_update_server_with_port, as bug #1607714 seems to be fixed now. Change-Id: Ie674fd556418f6aa8e79654458cbe43648851db2 Closes-Bug: #1713952 --- heat/engine/service.py | 1 + heat_integrationtests/prepare_test_env.sh | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/heat/engine/service.py b/heat/engine/service.py index 7b9937c777..4fc2130692 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -1163,6 +1163,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: diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh index 2960326543..4464c9e620 100755 --- a/heat_integrationtests/prepare_test_env.sh +++ b/heat_integrationtests/prepare_test_env.sh @@ -56,10 +56,9 @@ iniset $conf_file heat_plugin boot_config_env $DEST/heat-templates/hot/software- iniset $conf_file heat_plugin heat_config_notify_script $DEST/heat-templates/hot/software-config/elements/heat-config/bin/heat-config-notify iniset $conf_file heat_plugin minimal_image_ref cirros-0.3.5-x86_64-disk -# Skip test_cancel_update_server_with_port till bug #1607714 is fixed in nova # Skip ReloadOnSighupTest. Most jobs now run with apache+uwsgi, so the test has no significance # Skip NotificationTest till bug #1721202 is fixed -iniset $conf_file heat_plugin skip_functional_test_list 'CancelUpdateTest.test_cancel_update_server_with_port, ReloadOnSighupTest, NotificationTest' +iniset $conf_file heat_plugin skip_functional_test_list 'ReloadOnSighupTest, NotificationTest' # Add scenario tests to skip # VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300