diff --git a/trove/cmd/conductor.py b/trove/cmd/conductor.py index 793ad6b606..969d21cabd 100644 --- a/trove/cmd/conductor.py +++ b/trove/cmd/conductor.py @@ -34,5 +34,6 @@ def main(conf): rpc_api_version=conductor_api.API.API_LATEST_VERSION, secure_serializer=sz.ConductorHostSerializer) workers = conf.trove_conductor_workers or processutils.get_worker_count() - launcher = openstack_service.launch(conf, server, workers=workers) + launcher = openstack_service.launch(conf, server, workers=workers, + restart_method='mutate') launcher.wait() diff --git a/trove/cmd/guest.py b/trove/cmd/guest.py index d4f90b8381..d45ebf0d49 100644 --- a/trove/cmd/guest.py +++ b/trove/cmd/guest.py @@ -66,5 +66,5 @@ def main(): manager=manager, host=CONF.guest_id, rpc_api_version=guest_api.API.API_LATEST_VERSION) - launcher = openstack_service.launch(CONF, server) + launcher = openstack_service.launch(CONF, server, restart_method='mutate') launcher.wait() diff --git a/trove/cmd/taskmanager.py b/trove/cmd/taskmanager.py index 549e14b292..39d8a767fc 100644 --- a/trove/cmd/taskmanager.py +++ b/trove/cmd/taskmanager.py @@ -38,7 +38,8 @@ def startup(conf, topic): server = rpc_service.RpcService( key=key, manager=conf.taskmanager_manager, topic=topic, rpc_api_version=task_api.API.API_LATEST_VERSION) - launcher = openstack_service.launch(conf, server) + launcher = openstack_service.launch(conf, server, + restart_method='mutate') launcher.wait() diff --git a/trove/common/wsgi.py b/trove/common/wsgi.py index e294ea182d..366f3f0f5b 100644 --- a/trove/common/wsgi.py +++ b/trove/common/wsgi.py @@ -80,7 +80,7 @@ def launch(app_name, port, paste_config_file, data={}, app = pastedeploy.paste_deploy_app(paste_config_file, app_name, data) server = base_wsgi.Service(app, port, host=host, backlog=backlog, threads=threads) - return service.launch(CONF, server, workers) + return service.launch(CONF, server, workers, restart_method='mutate') # Note: taken from Nova diff --git a/trove/tests/unittests/conductor/test_conf.py b/trove/tests/unittests/conductor/test_conf.py index 924dc693f7..a26587e511 100644 --- a/trove/tests/unittests/conductor/test_conf.py +++ b/trove/tests/unittests/conductor/test_conf.py @@ -48,7 +48,7 @@ class ConductorConfTests(trove_testtools.TestCase): super(ConductorConfTests, self).tearDown() def _test_manager(self, conf, rt_mgr_name): - def mock_launch(conf, server, workers): + def mock_launch(conf, server, workers, restart_method): qualified_mgr = "%s.%s" % (server.manager_impl.__module__, server.manager_impl.__class__.__name__) self.assertEqual(rt_mgr_name, qualified_mgr, "Invalid manager")