openstack
/
nova
Code Issues Proposed changes

Merge "Use CONF.long_rpc_timeout in post_live_migration_at_destination"

This commit is contained in:
Zuul 2018-08-22 06:51:56 +00:00 committed by Gerrit Code Review
parent ec0c45afbf f628dc9099
commit 17b69575bc
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/compute/rpcapi.py
View File

@ -695,7 +695,9 @@ class ComputeAPI(object):
block_migration, host):
version = '5.0'
cctxt = self.router.client(ctxt).prepare(
server=host, version=version)
server=host, version=version,
call_monitor_timeout=CONF.rpc_response_timeout,
timeout=CONF.long_rpc_timeout)
return cctxt.call(ctxt, 'post_live_migration_at_destination',
instance=instance, block_migration=block_migration)

4
nova/tests/unit/compute/test_rpcapi.py
View File

@ -342,9 +342,11 @@ class ComputeRpcAPITestCase(test.NoDBTestCase):
migration_id='1', version='5.0')
def test_post_live_migration_at_destination(self):
self.flags(long_rpc_timeout=1234)
self._test_compute_api('post_live_migration_at_destination', 'call',
instance=self.fake_instance_obj,
block_migration='block_migration', host='host', version='5.0')
block_migration='block_migration', host='host', version='5.0',
timeout=1234, call_monitor_timeout=60)
def test_pause_instance(self):
self._test_compute_api('pause_instance', 'cast',