openstack/trove
Code Issues Proposed changes

Merge "Enable mutable config in trove"

Browse Source
This commit is contained in:
Zuul 2018-08-23 14:26:53 +00:00 committed by Gerrit Code Review
commit e10725fe38
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
trove/cmd/conductor.py
View File

@ -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()

2
trove/cmd/guest.py
View File

@ -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()

3
trove/cmd/taskmanager.py
View File

@ -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()

2
trove/common/wsgi.py
View File

@ -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

2
trove/tests/unittests/conductor/test_conf.py
View File

@ -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")