openstack/heat
Code Issues Proposed changes

Merge "Always start convergence worker service"

Browse Source
This commit is contained in:
Zuul 2018-08-03 05:32:16 +00:00 committed by Gerrit Code Review
commit 173715e84e
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/service.py
View File

@ -345,7 +345,6 @@ class EngineService(service.ServiceBase):
LOG.debug("Starting listener for engine %s", self.engine_id) LOG.debug("Starting listener for engine %s", self.engine_id)
self.listener.start() self.listener.start()
if cfg.CONF.convergence_engine:
self.worker_service = worker.WorkerService( self.worker_service = worker.WorkerService(
host=self.host, host=self.host,
topic=rpc_worker_api.TOPIC, topic=rpc_worker_api.TOPIC,
@ -401,8 +400,7 @@ class EngineService(service.ServiceBase):
if self.listener: if self.listener:
self.listener.stop() self.listener.stop()
if cfg.CONF.convergence_engine and self.worker_service: if self.worker_service:
# Stop the WorkerService
self.worker_service.stop() self.worker_service.stop()
# Wait for all active threads to be finished # Wait for all active threads to be finished
@ -1373,7 +1371,7 @@ class EngineService(service.ServiceBase):
stack = parser.Stack.load(cnxt, stack=st) stack = parser.Stack.load(cnxt, stack=st)
self.resource_enforcer.enforce_stack(stack, is_registered_policy=True) self.resource_enforcer.enforce_stack(stack, is_registered_policy=True)
if stack.convergence and cfg.CONF.convergence_engine: if stack.convergence:
stack.thread_group_mgr = self.thread_group_mgr stack.thread_group_mgr = self.thread_group_mgr
template = templatem.Template.create_empty_template( template = templatem.Template.create_empty_template(
from_template=stack.t) from_template=stack.t)

9
heat/tests/engine/service/test_service_engine.py
View File

@ -227,6 +227,8 @@ class ServiceEngineTest(common.HeatTestCase):
return_value=mock.Mock()) return_value=mock.Mock())
@mock.patch('heat.engine.service.EngineListener', @mock.patch('heat.engine.service.EngineListener',
return_value=mock.Mock()) return_value=mock.Mock())
@mock.patch('heat.engine.worker.WorkerService',
return_value=mock.Mock())
@mock.patch('oslo_service.threadgroup.ThreadGroup', @mock.patch('oslo_service.threadgroup.ThreadGroup',
return_value=mock.Mock()) return_value=mock.Mock())
@mock.patch.object(service.EngineService, '_configure_db_conn_pool_size') @mock.patch.object(service.EngineService, '_configure_db_conn_pool_size')
@ -234,16 +236,17 @@ class ServiceEngineTest(common.HeatTestCase):
self, self,
configure_db_conn_pool_size, configure_db_conn_pool_size,
thread_group_class, thread_group_class,
worker_service_class,
engine_listener_class, engine_listener_class,
thread_group_manager_class, thread_group_manager_class,
sample_uuid_method, sample_uuid_method,
rpc_client_class, rpc_client_class,
target_class, target_class,
rpc_server_method): rpc_server_method):
cfg.CONF.set_default('convergence_engine', False) cfg.CONF.set_override('convergence_engine', False)
self._test_engine_service_start( self._test_engine_service_start(
thread_group_class, thread_group_class,
None, worker_service_class,
engine_listener_class, engine_listener_class,
thread_group_manager_class, thread_group_manager_class,
sample_uuid_method, sample_uuid_method,
@ -280,7 +283,7 @@ class ServiceEngineTest(common.HeatTestCase):
rpc_client_class, rpc_client_class,
target_class, target_class,
rpc_server_method): rpc_server_method):
cfg.CONF.set_default('convergence_engine', True) cfg.CONF.set_override('convergence_engine', True)
self._test_engine_service_start( self._test_engine_service_start(
thread_group_class, thread_group_class,
worker_service_class, worker_service_class,