openstack/neutron
Code Issues Proposed changes

Merge "Do not call update_device_list in large sets" into stable/rocky

Browse Source
This commit is contained in:
Zuul 2019-04-17 19:23:25 +00:00 committed by Gerrit Code Review
commit 5e88181198
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
neutron/agent/rpc.py
View File

@ -151,10 +151,31 @@ class PluginApi(object):
def update_device_list(self, context, devices_up, devices_down, def update_device_list(self, context, devices_up, devices_down,
agent_id, host, agent_restarted=False): agent_id, host, agent_restarted=False):
cctxt = self.client.prepare(version='1.5') cctxt = self.client.prepare(version='1.5')
return cctxt.call(context, 'update_device_list',
devices_up=devices_up, devices_down=devices_down, ret_devices_up = []
agent_id=agent_id, host=host, failed_devices_up = []
agent_restarted=agent_restarted) ret_devices_down = []
failed_devices_down = []
step = n_const.RPC_RES_PROCESSING_STEP
devices_up = list(devices_up)
devices_down = list(devices_down)
for i in range(0, max(len(devices_up), len(devices_down)), step):
# Divide-and-conquer RPC timeout
ret = cctxt.call(context, 'update_device_list',
devices_up=devices_up[i:i + step],
devices_down=devices_down[i:i + step],
agent_id=agent_id, host=host,
agent_restarted=agent_restarted)
ret_devices_up.extend(ret.get("devices_up", []))
failed_devices_up.extend(ret.get("failed_devices_up", []))
ret_devices_down.extend(ret.get("devices_down", []))
failed_devices_down.extend(ret.get("failed_devices_down", []))
return {'devices_up': ret_devices_up,
'failed_devices_up': failed_devices_up,
'devices_down': ret_devices_down,
'failed_devices_down': failed_devices_down}
def tunnel_sync(self, context, tunnel_ip, tunnel_type=None, host=None): def tunnel_sync(self, context, tunnel_ip, tunnel_type=None, host=None):
cctxt = self.client.prepare(version='1.4') cctxt = self.client.prepare(version='1.4')

3
neutron/common/constants.py
View File

@ -265,3 +265,6 @@ EXT_PARENT_PREFIX = 'ext_parent'
# for the restart success rate. # for the restart success rate.
# [1] http://paste.openstack.org/show/745685/ # [1] http://paste.openstack.org/show/745685/
AGENT_RES_PROCESSING_STEP = 100 AGENT_RES_PROCESSING_STEP = 100
# Number of resources for neutron to divide the large RPC
# call data sets.
RPC_RES_PROCESSING_STEP = 20

10
neutron/tests/unit/plugins/ml2/test_rpc.py
View File

@ -327,9 +327,17 @@ class RpcCallbacksTestCase(base.BaseTestCase):
class RpcApiTestCase(base.BaseTestCase): class RpcApiTestCase(base.BaseTestCase):
def _test_rpc_api(self, rpcapi, topic, method, rpc_method, **kwargs): def _test_rpc_api(self, rpcapi, topic, method, rpc_method, **kwargs):
if method == "update_device_list":
expected = {'devices_up': [],
'failed_devices_up': [],
'devices_down': [],
'failed_devices_down': []}
else:
expected = 'foo'
ctxt = oslo_context.RequestContext(user_id='fake_user', ctxt = oslo_context.RequestContext(user_id='fake_user',
tenant='fake_project') tenant='fake_project')
expected_retval = 'foo' if rpc_method == 'call' else None expected_retval = expected if rpc_method == 'call' else None
expected_version = kwargs.pop('version', None) expected_version = kwargs.pop('version', None)
fanout = kwargs.pop('fanout', False) fanout = kwargs.pop('fanout', False)