From: Ben Pfaff Date: Fri, 2 Mar 2012 21:26:35 +0000 (-0800) Subject: bridge: Remove unwanted ports at time of ofproto creation. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e56365a56e3cfa8066255bb765a54e8cfad3ff75;p=openvswitch bridge: Remove unwanted ports at time of ofproto creation. The reconfiguration code only deleted unwanted ports for bridges that had been created in previous (re)configurations. In fact, we should run this step even for bridges that are newly added, e.g. to delete ports that were added by a previous run of ovs-vswitchd and deleted from the database between runs. Before this commit, the following left "int" in datapath br0. After this commit, "int" is properly deleted: 1. With ovs-vswitchd running: # ovs-vsctl add-br br0 # ovs-vsctl add-port br0 int -- set interface int type=internal 2. Kill ovs-vswitchd, then: # ovs-vsctl --no-wait -- del-port br0 int 3. Restart ovs-vswitchd. Bug #9957. Reported-by: Hiroshi Tanaka Signed-off-by: Ben Pfaff --- diff --git a/AUTHORS b/AUTHORS index cdf6ce6e..4af1cceb 100644 --- a/AUTHORS +++ b/AUTHORS @@ -92,6 +92,7 @@ Gregor Schaffrath grsch@net.t-labs.tu-berlin.de Hassan Khan hassan.khan@seecs.edu.pk Hector Oron hector.oron@gmail.com Henrik Amren henrik@nicira.com +Hiroshi Tanaka htanaka@nicira.com Jacob Cherkas jcherkas@nicira.com Jad Naous jnaous@gmail.com Jamal Hadi Salim hadi@cyberus.ca diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c index 6293dad5..7c3e4ba1 100644 --- a/vswitchd/bridge.c +++ b/vswitchd/bridge.c @@ -438,8 +438,12 @@ bridge_reconfigure(const struct ovsrec_open_vswitch *ovs_cfg) * has at least one iface, every "struct iface" has a valid ofp_port and * netdev. */ HMAP_FOR_EACH_SAFE (br, next, node, &all_bridges) { - if (!br->ofproto && !bridge_add_ofprotos(br)) { - bridge_destroy(br); + if (!br->ofproto) { + if (bridge_add_ofprotos(br)) { + bridge_del_ofproto_ports(br); + } else { + bridge_destroy(br); + } } } HMAP_FOR_EACH (br, node, &all_bridges) {