[ovs-dev] [PATCH v3 16/16] ovn-controller: Monitor only necessary southbound rows.
Ben Pfaff
blp at ovn.org
Sun Dec 18 08:18:34 UTC 2016
Until now, ovn-controller has replicated all of the southbound database
(through the IDL). This is inefficient, especially in a large OVN setup
where many logical networks are not present on an individual hypervisor.
This commit improves on the situation somewhat, by making ovn-controller
replicate (almost) only the port bindings, logical flows, and multicast
groups that are actually relevant to the particular hypervisor on which
ovn-controller is running. This is easily possible by replicating the
patch ports from the Port_Binding table and using these relationships to
determine connections between datapaths.
This patch is strongly influenced by earlier work from the CCed developers.
I am grateful for their assistance.
CC: Darrell Ball <dlu998 at gmail.com>
CC: Liran Schour <LIRANS at il.ibm.com>
Signed-off-by: Ben Pfaff <blp at ovn.org>
---
ovn/controller/binding.c | 2 ++
ovn/controller/ovn-controller.c | 52 +++++++++++++++++++++++++++++++++++++++++
tests/ovn.at | 4 ++--
3 files changed, 56 insertions(+), 2 deletions(-)
diff --git a/ovn/controller/binding.c b/ovn/controller/binding.c
index fbdcf67..9543bb2 100644
--- a/ovn/controller/binding.c
+++ b/ovn/controller/binding.c
@@ -393,6 +393,7 @@ consider_local_datapath(struct controller_ctx *ctx,
add_local_datapath(ldatapaths, lports, binding_rec->datapath,
true, local_datapaths);
}
+ sset_add(local_lports, binding_rec->logical_port);
} else if (chassis_rec && binding_rec->chassis == chassis_rec) {
if (ctx->ovnsb_idl_txn) {
VLOG_INFO("Releasing lport %s from this chassis.",
@@ -402,6 +403,7 @@ consider_local_datapath(struct controller_ctx *ctx,
}
sbrec_port_binding_set_chassis(binding_rec, NULL);
+
sset_find_and_delete(local_lports, binding_rec->logical_port);
}
} else if (!binding_rec->chassis
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 7a30c2a..37b7756 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -118,6 +118,55 @@ get_bridge(struct ovsdb_idl *ovs_idl, const char *br_name)
return NULL;
}
+static void
+update_sb_monitors(struct ovsdb_idl *ovnsb_idl,
+ const struct sset *local_ifaces,
+ struct hmap *local_datapaths)
+{
+ /* Monitor Port_Bindings rows for local interfaces and local datapaths.
+ *
+ * Monitor Logical_Flow, MAC_Binding, and Multicast_Group tables for
+ * local datapaths.
+ *
+ * We always monitor patch ports because they allow us to see the linkages
+ * between related logical datapaths. That way, when we know that we have
+ * a VIF on a particular logical switch, we immediately know to monitor all
+ * the connected logical routers and logical switches. */
+ struct ovsdb_idl_condition pb = OVSDB_IDL_CONDITION_INIT;
+ struct ovsdb_idl_condition lf = OVSDB_IDL_CONDITION_INIT;
+ struct ovsdb_idl_condition mb = OVSDB_IDL_CONDITION_INIT;
+ struct ovsdb_idl_condition mg = OVSDB_IDL_CONDITION_INIT;
+ sbrec_port_binding_add_clause_type(&pb, OVSDB_F_EQ, "patch");
+ sbrec_port_binding_add_clause_type(&pb, OVSDB_F_EQ, "l2gateway");
+ sbrec_port_binding_add_clause_type(&pb, OVSDB_F_EQ, "l3gateway");
+ sbrec_port_binding_add_clause_type(&pb, OVSDB_F_EQ, "localnet");
+ if (local_ifaces) {
+ const char *name;
+ SSET_FOR_EACH (name, local_ifaces) {
+ sbrec_port_binding_add_clause_logical_port(&pb, OVSDB_F_EQ, name);
+ }
+ }
+ if (local_datapaths) {
+ const struct local_datapath *ld;
+ HMAP_FOR_EACH (ld, hmap_node, local_datapaths) {
+ const struct uuid *uuid = &ld->datapath->header_.uuid;
+ sbrec_port_binding_add_clause_datapath(&pb, OVSDB_F_EQ, uuid);
+ sbrec_logical_flow_add_clause_logical_datapath(&lf, OVSDB_F_EQ,
+ uuid);
+ sbrec_mac_binding_add_clause_datapath(&mb, OVSDB_F_EQ, uuid);
+ sbrec_multicast_group_add_clause_datapath(&mg, OVSDB_F_EQ, uuid);
+ }
+ }
+ sbrec_port_binding_set_condition(ovnsb_idl, &pb);
+ sbrec_logical_flow_set_condition(ovnsb_idl, &lf);
+ sbrec_mac_binding_set_condition(ovnsb_idl, &mb);
+ sbrec_multicast_group_set_condition(ovnsb_idl, &mg);
+ ovsdb_idl_condition_destroy(&pb);
+ ovsdb_idl_condition_destroy(&lf);
+ ovsdb_idl_condition_destroy(&mb);
+ ovsdb_idl_condition_destroy(&mg);
+}
+
static const struct ovsrec_bridge *
create_br_int(struct controller_ctx *ctx,
const struct ovsrec_open_vswitch *cfg,
@@ -451,6 +500,7 @@ main(int argc, char *argv[])
struct ovsdb_idl_loop ovnsb_idl_loop = OVSDB_IDL_LOOP_INITIALIZER(
ovsdb_idl_create(ovnsb_remote, &sbrec_idl_class, true, true));
ovsdb_idl_omit_alert(ovnsb_idl_loop.idl, &sbrec_chassis_col_nb_cfg);
+ update_sb_monitors(ovnsb_idl_loop.idl, NULL, NULL);
/* Track the southbound idl. */
ovsdb_idl_get_initial_snapshot(ovnsb_idl_loop.idl);
@@ -545,6 +595,8 @@ main(int argc, char *argv[])
}
}
}
+
+ update_sb_monitors(ctx.ovnsb_idl, &local_lports, &local_datapaths);
}
mcgroup_index_destroy(&mcgroups);
diff --git a/tests/ovn.at b/tests/ovn.at
index 628d3c8..3779741 100644
--- a/tests/ovn.at
+++ b/tests/ovn.at
@@ -5403,9 +5403,9 @@ AT_CHECK([ovs-vsctl add-port br-int localvif1 -- set Interface localvif1 externa
# On hv1, check that there are no flows outputting bcast to tunnel
OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=32 | ofctl_strip | grep output | wc -l` -eq 0])
-# On hv2, check that there is 1 flow outputting bcast to tunnel to hv1.
+# On hv2, check that no flow outputs bcast to tunnel to hv1.
as hv2
-OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=32 | ofctl_strip | grep output | wc -l` -eq 1])
+OVS_WAIT_UNTIL([test `ovs-ofctl dump-flows br-int table=32 | ofctl_strip | grep output | wc -l` -eq 0])
# Now bind vif2 on hv2.
AT_CHECK([ovs-vsctl add-port br-int localvif2 -- set Interface localvif2 external_ids:iface-id=localvif2])
--
2.10.2
More information about the dev
mailing list