From: RYAN D. MOATS <rmo...@us.ibm.com>
Persist all_lports structure and ensure that binding_run
resets to process the entire port binding table when chassis
are added/removed or when get_local_iface_ids finds new ports
on the local vswitch.
Signed-off-by: RYAN D. MOATS <rmo...@us.ibm.com>
---
ovn/controller/binding.c | 57 ++++++++++++++++++++++++++++++--------
ovn/controller/binding.h | 1 +
ovn/controller/encaps.c | 2 +
ovn/controller/ovn-controller.h | 1 +
4 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c
index 58402fd..802abe4 100644
--- a/ovn/controller/binding.c
+++ b/ovn/controller/binding.c
@@ -28,6 +28,16 @@
VLOG_DEFINE_THIS_MODULE(binding);
+struct sset all_lports = SSET_INITIALIZER(&all_lports);
+
+unsigned int binding_seqno = 0;
+
+void
+reset_binding_seqno(void)
+{
+ binding_seqno = 0;
+}
+
void
binding_register_ovs_idl(struct ovsdb_idl *ovs_idl)
{
@@ -73,6 +83,10 @@ get_local_iface_ids(const struct ovsrec_bridge *br_int,
struct shash *lports)
continue;
}
shash_add(lports, iface_id, iface_rec);
+ if (!sset_find(&all_lports, iface_id)) {
+ sset_add(&all_lports, iface_id);
+ reset_binding_seqno();
+ }
}
}
}
@@ -130,7 +144,12 @@ struct hmap local_datapaths_by_uuid =
static struct local_datapath *
local_datapath_lookup_by_uuid(const struct uuid *uuid)
{
- return hmap_first_with_hash(&local_datapaths_by_uuid, uuid_hash(uuid));
+ struct hmap_node *ld_node = hmap_first_with_hash(&local_datapaths_by_uuid,
+ uuid_hash(uuid));
+ if (ld_node) {
+ return CONTAINER_OF(ld_node, struct local_datapath, uuid_hmap_node);
+ }
+ return NULL;
}
static void
@@ -138,8 +157,13 @@ remove_local_datapath(struct hmap *local_datapaths, const
struct uuid *uuid)
{
struct local_datapath *ld = local_datapath_lookup_by_uuid(uuid);
if (ld) {
+ if (ld->logical_port) {
+ sset_find_and_delete(&all_lports, ld->logical_port);
+ free(ld->logical_port);
+ }
hmap_remove(local_datapaths, &ld->hmap_node);
hmap_remove(&local_datapaths_by_uuid, &ld->uuid_hmap_node);
+ free(ld);
reset_flow_processing();
}
}
@@ -155,6 +179,7 @@ add_local_datapath(struct hmap *local_datapaths,
}
struct local_datapath *ld = xzalloc(sizeof *ld);
+ ld->logical_port = xstrdup(binding_rec->logical_port);
hmap_insert(local_datapaths, &ld->hmap_node,
binding_rec->datapath->tunnel_key);
hmap_insert(&local_datapaths_by_uuid, &ld->uuid_hmap_node,
@@ -194,26 +219,39 @@ binding_run(struct controller_ctx *ctx, const struct
ovsrec_bridge *br_int,
* We'll remove our chassis from all port binding records below. */
}
- struct sset all_lports = SSET_INITIALIZER(&all_lports);
- struct shash_node *node;
- SHASH_FOR_EACH (node, &lports) {
- sset_add(&all_lports, node->name);
- }
-
/* Run through each binding record to see if it is resident on this
* chassis and update the binding accordingly. This includes both
* directly connected logical ports and children of those ports. */
SBREC_PORT_BINDING_FOR_EACH_TRACKED(binding_rec, ctx->ovnsb_idl) {
unsigned int del_seqno = sbrec_port_binding_row_get_seqno(binding_rec,
OVSDB_IDL_CHANGE_DELETE);
+ unsigned int mod_seqno = sbrec_port_binding_row_get_seqno(binding_rec,
+ OVSDB_IDL_CHANGE_MODIFY);
+ unsigned int ins_seqno = sbrec_port_binding_row_get_seqno(binding_rec,
+ OVSDB_IDL_CHANGE_INSERT);
+
+ if (del_seqno <= binding_seqno && mod_seqno <= binding_seqno
+ && ins_seqno <= binding_seqno) {
+ continue;
+ }
/* if the row has a del_seqno > 0, then trying to process the row
* isn't going to work (as it has already been freed) */
if (del_seqno > 0) {
remove_local_datapath(local_datapaths, &binding_rec->header_.uuid);
+ if (del_seqno >= binding_seqno) {
+ binding_seqno = del_seqno;
+ }
continue;
}
+ if (mod_seqno >= binding_seqno) {
+ binding_seqno = mod_seqno;
+ }
+ if (ins_seqno >= binding_seqno) {
+ binding_seqno = ins_seqno;
+ }
+
const struct ovsrec_interface *iface_rec
= shash_find_and_delete(&lports, binding_rec->logical_port);
if (iface_rec
@@ -259,14 +297,9 @@ binding_run(struct controller_ctx *ctx, const struct
ovsrec_bridge *br_int,
}
}
- SHASH_FOR_EACH (node, &lports) {
- VLOG_DBG("No port binding record for lport %s", node->name);
- }
-
update_ct_zones(&all_lports, ct_zones, ct_zone_bitmap);
shash_destroy(&lports);
- sset_destroy(&all_lports);
}
/* Returns true if the database is all cleaned up, false if more work is
diff --git a/ovn/controller/binding.h b/ovn/controller/binding.h
index 6e19c10..ba0be95 100644
--- a/ovn/controller/binding.h
+++ b/ovn/controller/binding.h
@@ -26,6 +26,7 @@ struct ovsrec_bridge;
struct simap;
void binding_register_ovs_idl(struct ovsdb_idl *);
+void reset_binding_seqno(void);
void binding_run(struct controller_ctx *, const struct ovsrec_bridge *br_int,
const char *chassis_id, struct simap *ct_zones,
unsigned long *ct_zone_bitmap, struct hmap *local_datapaths);
diff --git a/ovn/controller/encaps.c b/ovn/controller/encaps.c
index 8395051..777ccee 100644
--- a/ovn/controller/encaps.c
+++ b/ovn/controller/encaps.c
@@ -217,6 +217,7 @@ tunnel_add(const struct sbrec_chassis *chassis_rec,
free(port_name);
free(ports);
reset_flow_processing();
+ reset_binding_seqno();
encaps_seqno = 0;
}
@@ -323,6 +324,7 @@ encaps_run(struct controller_ctx *ctx, const struct
ovsrec_bridge *br_int,
hmap_remove(&tc.tunnel_hmap_by_uuid, &port_hash->uuid_node);
free(port_hash);
reset_flow_processing();
+ reset_binding_seqno();
}
if (encaps_seqno <= del_seqno) {
encaps_seqno = del_seqno;
diff --git a/ovn/controller/ovn-controller.h b/ovn/controller/ovn-controller.h
index e8e21fb..b7251e2 100644
--- a/ovn/controller/ovn-controller.h
+++ b/ovn/controller/ovn-controller.h
@@ -39,6 +39,7 @@ struct controller_ctx {
struct local_datapath {
struct hmap_node hmap_node;
struct hmap_node uuid_hmap_node;
+ char *logical_port;
const struct sbrec_port_binding *localnet_port;
};
--
1.7.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
