openstack/neutron
Code Issues Proposed changes

Merge "More graceful ovs-agent restart"

Browse Source
This commit is contained in:
Jenkins 2015-11-12 03:48:54 +00:00 committed by Gerrit Code Review
commit a178e2f31f
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1648,13 +1648,12 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
return port_stats return port_stats
def cleanup_stale_flows(self): def cleanup_stale_flows(self):
if self.iter_num == 0: bridges = [self.int_br]
bridges = [self.int_br] if self.enable_tunneling:
if self.enable_tunneling: bridges.append(self.tun_br)
bridges.append(self.tun_br) for bridge in bridges:
for bridge in bridges: LOG.info(_LI("Cleaning stale %s flows"), bridge.br_name)
LOG.info(_LI("Cleaning stale %s flows"), bridge.br_name) bridge.cleanup_flows()
bridge.cleanup_flows()
def rpc_loop(self, polling_manager=None): def rpc_loop(self, polling_manager=None):
if not polling_manager: if not polling_manager:
@ -1668,6 +1667,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
tunnel_sync = True tunnel_sync = True
ovs_restarted = False ovs_restarted = False
consecutive_resyncs = 0 consecutive_resyncs = 0
need_clean_stale_flow = True
while self._check_and_handle_signal(): while self._check_and_handle_signal():
port_info = {} port_info = {}
ancillary_port_info = {} ancillary_port_info = {}
@ -1764,7 +1764,9 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
# If treat devices fails - must resync with plugin # If treat devices fails - must resync with plugin
sync = self.process_network_ports(port_info, sync = self.process_network_ports(port_info,
ovs_restarted) ovs_restarted)
self.cleanup_stale_flows() if not sync and need_clean_stale_flow:
self.cleanup_stale_flows()
need_clean_stale_flow = False
LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - " LOG.debug("Agent rpc_loop - iteration:%(iter_num)d - "
"ports processed. Elapsed:%(elapsed).3f", "ports processed. Elapsed:%(elapsed).3f",
{'iter_num': self.iter_num, {'iter_num': self.iter_num,

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

@ -1425,6 +1425,31 @@ class TestOvsNeutronAgent(object):
self._test_ovs_status(constants.OVS_NORMAL, self._test_ovs_status(constants.OVS_NORMAL,
constants.OVS_RESTARTED) constants.OVS_RESTARTED)
def test_rpc_loop_fail_to_process_network_ports_keep_flows(self):
with mock.patch.object(async_process.AsyncProcess, "_spawn"),\
mock.patch.object(async_process.AsyncProcess, "start"),\
mock.patch.object(async_process.AsyncProcess, "stop"),\
mock.patch.object(
self.mod_agent.OVSNeutronAgent,
'process_network_ports') as process_network_ports,\
mock.patch.object(self.mod_agent.OVSNeutronAgent,
'check_ovs_status') as check_ovs_status,\
mock.patch.object(time, 'sleep'),\
mock.patch.object(
self.mod_agent.OVSNeutronAgent,
'update_stale_ofport_rules') as update_stale, \
mock.patch.object(self.mod_agent.OVSNeutronAgent,
'cleanup_stale_flows') as cleanup,\
mock.patch.object(
self.mod_agent.OVSNeutronAgent,
'_check_and_handle_signal') as check_and_handle_signal:
process_network_ports.return_value = True
check_ovs_status.return_value = constants.OVS_NORMAL
check_and_handle_signal.side_effect = [True, False]
self.agent.daemon_loop()
self.assertTrue(update_stale.called)
self.assertFalse(cleanup.called)
def test_set_rpc_timeout(self): def test_set_rpc_timeout(self):
self.agent._handle_sigterm(None, None) self.agent._handle_sigterm(None, None)
for rpc_client in (self.agent.plugin_rpc.client, for rpc_client in (self.agent.plugin_rpc.client,
@ -1581,7 +1606,7 @@ class TestOvsNeutronAgent(object):
class TestOvsNeutronAgentOFCtl(TestOvsNeutronAgent, class TestOvsNeutronAgentOFCtl(TestOvsNeutronAgent,
ovs_test_base.OVSOFCtlTestBase): ovs_test_base.OVSOFCtlTestBase):
def test_cleanup_stale_flows_iter_0(self): def test_cleanup_stale_flows(self):
with mock.patch.object(self.agent.int_br, 'agent_uuid_stamp', with mock.patch.object(self.agent.int_br, 'agent_uuid_stamp',
new=1234),\ new=1234),\
mock.patch.object(self.agent.int_br, mock.patch.object(self.agent.int_br,
@ -1594,6 +1619,7 @@ class TestOvsNeutronAgentOFCtl(TestOvsNeutronAgent,
'cookie=0x2345, duration=50.125s, table=2, priority=0', 'cookie=0x2345, duration=50.125s, table=2, priority=0',
'cookie=0x4d2, duration=52.112s, table=3, actions=drop', 'cookie=0x4d2, duration=52.112s, table=3, actions=drop',
] ]
self.agent.iter_num = 3
self.agent.cleanup_stale_flows() self.agent.cleanup_stale_flows()
expected = [ expected = [
mock.call(cookie='0x4321/-1', table='2'), mock.call(cookie='0x4321/-1', table='2'),
@ -1604,7 +1630,7 @@ class TestOvsNeutronAgentOFCtl(TestOvsNeutronAgent,
class TestOvsNeutronAgentRyu(TestOvsNeutronAgent, class TestOvsNeutronAgentRyu(TestOvsNeutronAgent,
ovs_test_base.OVSRyuTestBase): ovs_test_base.OVSRyuTestBase):
def test_cleanup_stale_flows_iter_0(self): def test_cleanup_stale_flows(self):
uint64_max = (1 << 64) - 1 uint64_max = (1 << 64) - 1
with mock.patch.object(self.agent.int_br, 'agent_uuid_stamp', with mock.patch.object(self.agent.int_br, 'agent_uuid_stamp',
new=1234),\ new=1234),\
@ -1619,6 +1645,7 @@ class TestOvsNeutronAgentRyu(TestOvsNeutronAgent,
mock.Mock(cookie=9029, table_id=2), mock.Mock(cookie=9029, table_id=2),
mock.Mock(cookie=1234, table_id=3), mock.Mock(cookie=1234, table_id=3),
] ]
self.agent.iter_num = 3
self.agent.cleanup_stale_flows() self.agent.cleanup_stale_flows()
expected = [mock.call(cookie=17185, expected = [mock.call(cookie=17185,
cookie_mask=uint64_max), cookie_mask=uint64_max),