openstack
/
neutron
Code Issues Proposed changes

Merge "OVS agent: always send start flag during initial sync" into stable/ocata

This commit is contained in:
Zuul 2019-04-08 11:28:13 +00:00 committed by Gerrit Code Review
parent 5e7d3a12cd 64e98ff959
commit cc9e23b424
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -315,11 +315,16 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
self.fullsync = True
# we only want to update resource versions on startup
self.agent_state.pop('resource_versions', None)
if self.agent_state.pop('start_flag', None) and self.iter_num == 0:
if self.agent_state.pop('resource_versions', None):
# On initial start, we notify systemd after initialization
# is complete.
systemd.notify_once()
if self.iter_num > 0:
# agent is considered started after
# initial sync with server (iter 0) is done
self.agent_state.pop('start_flag', None)
except Exception:
LOG.exception(_LE("Failed reporting state!"))

3
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
View File

@ -1051,7 +1051,8 @@ class TestOvsNeutronAgent(object):
self.agent.agent_state, True)
self.systemd_notify.assert_called_once_with()
self.systemd_notify.reset_mock()
self.assertNotIn("start_flag", self.agent.agent_state)
# agent keeps sending "start_flag" while iter 0 not completed
self.assertIn("start_flag", self.agent.agent_state)
self.assertEqual(
self.agent.agent_state["configurations"]["devices"],
self.agent.int_br_device_count