From 8f2a946e09d270074655e94116f1987de9f5dad1 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Mon, 9 Jun 2014 23:08:14 +0800 Subject: [PATCH] Removed OVS_lib_defer_apply_doesn_t_handle_concurrency.patch applied upstream. Change-Id: I0bc29f8e5a2ff571cc170824bec06fe1308acfca Rewritten-From: 7010ceb5c900048d085d39f2836ddeb07bcd0fb1 --- trusty/debian/changelog | 2 + ...fer_apply_doesn_t_handle_concurrency.patch | 101 ------------------ trusty/debian/patches/series | 1 - 3 files changed, 2 insertions(+), 102 deletions(-) delete mode 100644 trusty/debian/patches/OVS_lib_defer_apply_doesn_t_handle_concurrency.patch diff --git a/trusty/debian/changelog b/trusty/debian/changelog index 625e839fc..38278d01a 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -1,6 +1,8 @@ neutron (2014.1.1-1) unstable; urgency=medium * New upstream release. + * Removed OVS_lib_defer_apply_doesn_t_handle_concurrency.patch applied + upstream. -- Thomas Goirand Mon, 09 Jun 2014 23:06:59 +0800 diff --git a/trusty/debian/patches/OVS_lib_defer_apply_doesn_t_handle_concurrency.patch b/trusty/debian/patches/OVS_lib_defer_apply_doesn_t_handle_concurrency.patch deleted file mode 100644 index 124278361..000000000 --- a/trusty/debian/patches/OVS_lib_defer_apply_doesn_t_handle_concurrency.patch +++ /dev/null @@ -1,101 +0,0 @@ -Description: OVS lib defer apply doesn't handle concurrency - OVS lib defer apply doesn't handle concurrency - . - The OVS lib deferred apply methods use a dict to save flows to add, - modify or delete when deffered apply is switched off. - If another thread adds, modifies or deletes flows on that dict during - another process called deffered_apply_off, its flows could be ignored. - . - This fix stash reference flows list and point the flows list to a new - cleared flows list. Then, it applies flows from the stashed flows list. -Author: Édouard Thuleau -Origin: upstream, https://review.openstack.org/94250 -Date: Mon, 3 Mar 2014 17:08:33 +0000 (+0100) -X-Git-Url: https://review.openstack.org/gitweb?p=openstack%2Fneutron.git;a=commitdiff_plain;h=efa4f2895f739ba191cfdd8dbe35e37fbead06c4 -Bug-Ubuntu: https://launchpad.net/bugs/1263866 -Last-Update: 2014-06-05 - -diff --git a/neutron/agent/linux/ovs_lib.py b/neutron/agent/linux/ovs_lib.py -index e117223..64cf1ba 100644 ---- a/neutron/agent/linux/ovs_lib.py -+++ b/neutron/agent/linux/ovs_lib.py -@@ -206,7 +206,14 @@ class OVSBridge(BaseOVS): - - def defer_apply_off(self): - LOG.debug(_('defer_apply_off')) -- for action, flows in self.deferred_flows.items(): -+ # Note(ethuleau): stash flows and disable deferred mode. Then apply -+ # flows from the stashed reference to be sure to not purge flows that -+ # were added between two ofctl commands. -+ stashed_deferred_flows, self.deferred_flows = ( -+ self.deferred_flows, {'add': '', 'mod': '', 'del': ''} -+ ) -+ self.defer_apply_flows = False -+ for action, flows in stashed_deferred_flows.items(): - if flows: - LOG.debug(_('Applying following deferred flows ' - 'to bridge %s'), self.br_name) -@@ -214,8 +221,6 @@ class OVSBridge(BaseOVS): - LOG.debug(_('%(action)s: %(flow)s'), - {'action': action, 'flow': line}) - self.run_ofctl('%s-flows' % action, ['-'], flows) -- self.defer_apply_flows = False -- self.deferred_flows = {'add': '', 'mod': '', 'del': ''} - - def add_tunnel_port(self, port_name, remote_ip, local_ip, - tunnel_type=p_const.TYPE_GRE, -diff --git a/neutron/tests/unit/openvswitch/test_ovs_lib.py b/neutron/tests/unit/openvswitch/test_ovs_lib.py -index a9c1b98..7b7d9d1 100644 ---- a/neutron/tests/unit/openvswitch/test_ovs_lib.py -+++ b/neutron/tests/unit/openvswitch/test_ovs_lib.py -@@ -401,6 +401,50 @@ class OVS_Lib_Test(base.BaseTestCase): - mock.call('del-flows', ['-'], 'deleted_flow_1\n') - ]) - -+ def test_defer_apply_flows_concurrently(self): -+ flow_expr = mock.patch.object(ovs_lib, '_build_flow_expr_str').start() -+ flow_expr.side_effect = ['added_flow_1', 'deleted_flow_1', -+ 'modified_flow_1', 'added_flow_2', -+ 'deleted_flow_2', 'modified_flow_2'] -+ -+ run_ofctl = mock.patch.object(self.br, 'run_ofctl').start() -+ -+ def run_ofctl_fake(cmd, args, process_input=None): -+ self.br.defer_apply_on() -+ if cmd == 'add-flows': -+ self.br.add_flow(flow='added_flow_2') -+ elif cmd == 'del-flows': -+ self.br.delete_flows(flow='deleted_flow_2') -+ elif cmd == 'mod-flows': -+ self.br.mod_flow(flow='modified_flow_2') -+ run_ofctl.side_effect = run_ofctl_fake -+ -+ self.br.defer_apply_on() -+ self.br.add_flow(flow='added_flow_1') -+ self.br.delete_flows(flow='deleted_flow_1') -+ self.br.mod_flow(flow='modified_flow_1') -+ self.br.defer_apply_off() -+ -+ run_ofctl.side_effect = None -+ self.br.defer_apply_off() -+ -+ flow_expr.assert_has_calls([ -+ mock.call({'flow': 'added_flow_1'}, 'add'), -+ mock.call({'flow': 'deleted_flow_1'}, 'del'), -+ mock.call({'flow': 'modified_flow_1'}, 'mod'), -+ mock.call({'flow': 'added_flow_2'}, 'add'), -+ mock.call({'flow': 'deleted_flow_2'}, 'del'), -+ mock.call({'flow': 'modified_flow_2'}, 'mod') -+ ]) -+ run_ofctl.assert_has_calls([ -+ mock.call('add-flows', ['-'], 'added_flow_1\n'), -+ mock.call('del-flows', ['-'], 'deleted_flow_1\n'), -+ mock.call('mod-flows', ['-'], 'modified_flow_1\n'), -+ mock.call('add-flows', ['-'], 'added_flow_2\n'), -+ mock.call('del-flows', ['-'], 'deleted_flow_2\n'), -+ mock.call('mod-flows', ['-'], 'modified_flow_2\n') -+ ]) -+ - def test_add_tunnel_port(self): - pname = "tap99" - local_ip = "1.1.1.1" diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index e40b8e9a0..d13d09724 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -1,6 +1,5 @@ fix-alembic-migration-with-sqlite3.patch better-config-default.patch -OVS_lib_defer_apply_doesn_t_handle_concurrency.patch 0001-Add-parameter-and-iptables-rules-to-protect-dnsmasq-.patch 0004-Fix-Metering-doesn-t-respect-the-l3-agent-binding.patch Properly_apply_column_default_in_migration_pool_monitor_status.patch -- 2.45.2