From: Han Zhou <hzh...@ebay.com>
Signed-off-by: Han Zhou <hzh...@ebay.com>
---
ovn/controller/lflow.h | 3 +-
ovn/controller/ovn-controller.c | 112 ++++++++++++++++++++++++++++++++++------
2 files changed, 99 insertions(+), 16 deletions(-)
diff --git a/ovn/controller/lflow.h b/ovn/controller/lflow.h
index 2a75ac5..2b5016e 100644
--- a/ovn/controller/lflow.h
+++ b/ovn/controller/lflow.h
@@ -70,7 +70,8 @@ struct uuid;
#define LOG_PIPELINE_LEN 24
enum ref_type {
- REF_TYPE_ADDRSET
+ REF_TYPE_ADDRSET,
+ REF_TYPE_PORTGROUP
};
/* Maintains the relationship for a pair of named resource and
diff --git a/ovn/controller/ovn-controller.c b/ovn/controller/ovn-controller.c
index 5ec9a5e..fa94879 100644
--- a/ovn/controller/ovn-controller.c
+++ b/ovn/controller/ovn-controller.c
@@ -357,6 +357,29 @@ port_groups_init(const struct sbrec_port_group_table
*port_group_table,
}
static void
+port_groups_update(const struct sbrec_port_group_table *port_group_table,
+ struct shash *port_groups, struct sset *new,
+ struct sset *deleted, struct sset *updated)
+{
+ const struct sbrec_port_group *pg;
+ SBREC_PORT_GROUP_TABLE_FOR_EACH_TRACKED (pg, port_group_table) {
+ if (sbrec_port_group_is_deleted(pg)) {
+ expr_const_sets_remove(port_groups, pg->name);
+ sset_add(deleted, pg->name);
+ } else {
+ expr_const_sets_add(port_groups, pg->name,
+ (const char *const *) pg->ports,
+ pg->n_ports, false);
+ if (sbrec_port_group_is_new(pg)) {
+ sset_add(new, pg->name);
+ } else {
+ sset_add(updated, pg->name);
+ }
+ }
+ }
+}
+
+static void
update_ssl_config(const struct ovsrec_ssl_table *ssl_table)
{
const struct ovsrec_ssl *ssl = ovsrec_ssl_table_first(ssl_table);
@@ -793,6 +816,30 @@ en_port_groups_run(struct engine_node *node)
node->changed = true;
}
+static bool
+port_groups_sb_port_group_handler(struct engine_node *node)
+{
+ struct ed_type_port_groups *pg = (struct ed_type_port_groups *)node->data;
+
+ sset_clear(&pg->new);
+ sset_clear(&pg->deleted);
+ sset_clear(&pg->updated);
+
+ struct sbrec_port_group_table *pg_table =
+ (struct sbrec_port_group_table *)EN_OVSDB_GET(
+ engine_get_input("SB_port_group", node));
+
+ port_groups_update(pg_table, &pg->port_groups, &pg->new,
+ &pg->deleted, &pg->updated);
+
+ node->changed = !sset_is_empty(&pg->new) || !sset_is_empty(&pg->deleted)
+ || !sset_is_empty(&pg->updated);
+
+ pg->change_tracked = true;
+ node->changed = true;
+ return true;
+}
+
struct ed_type_runtime_data {
/* Contains "struct local_datapath" nodes. */
struct hmap local_datapaths;
@@ -1436,7 +1483,8 @@ flow_output_sb_multicast_group_handler(struct engine_node
*node)
}
static bool
-flow_output_addr_sets_handler(struct engine_node *node)
+_flow_output_resource_ref_handler(struct engine_node *node,
+ enum ref_type ref_type)
{
struct ed_type_runtime_data *data =
(struct ed_type_runtime_data *)engine_get_input(
@@ -1447,11 +1495,6 @@ flow_output_addr_sets_handler(struct engine_node *node)
struct ed_type_addr_sets *as_data =
(struct ed_type_addr_sets *)engine_get_input("addr_sets", node)->data;
-
- /* XXX: The change_tracked check may be added to inc-proc framework. */
- if (!as_data->change_tracked) {
- return false;
- }
struct shash *addr_sets = &as_data->addr_sets;
struct ed_type_port_groups *pg_data =
@@ -1510,10 +1553,35 @@ flow_output_addr_sets_handler(struct engine_node *node)
engine_get_input("SB_logical_flow", node));
bool changed;
- const char *as;
+ const char *ref_name;
+ struct sset *new, *updated, *deleted;
+
+ switch (ref_type) {
+ case REF_TYPE_ADDRSET:
+ /* XXX: The change_tracked check may be added to inc-proc
+ * framework. */
+ if (!as_data->change_tracked) {
+ return false;
+ }
+ new = &as_data->new;
+ updated = &as_data->updated;
+ deleted = &as_data->deleted;
+ break;
+ case REF_TYPE_PORTGROUP:
+ if (!pg_data->change_tracked) {
+ return false;
+ }
+ new = &pg_data->new;
+ updated = &pg_data->updated;
+ deleted = &pg_data->deleted;
+ break;
+ default:
+ OVS_NOT_REACHED();
+ }
+
- SSET_FOR_EACH (as, &as_data->deleted) {
- if (!lflow_handle_changed_ref(REF_TYPE_ADDRSET, as,
+ SSET_FOR_EACH (ref_name, deleted) {
+ if (!lflow_handle_changed_ref(ref_type, ref_name,
sbrec_multicast_group_by_name_datapath,
sbrec_port_binding_by_name,dhcp_table,
dhcpv6_table, logical_flow_table,
@@ -1525,8 +1593,8 @@ flow_output_addr_sets_handler(struct engine_node *node)
}
node->changed = changed || node->changed;
}
- SSET_FOR_EACH (as, &as_data->updated) {
- if (!lflow_handle_changed_ref(REF_TYPE_ADDRSET, as,
+ SSET_FOR_EACH (ref_name, updated) {
+ if (!lflow_handle_changed_ref(ref_type, ref_name,
sbrec_multicast_group_by_name_datapath,
sbrec_port_binding_by_name,dhcp_table,
dhcpv6_table, logical_flow_table,
@@ -1538,8 +1606,8 @@ flow_output_addr_sets_handler(struct engine_node *node)
}
node->changed = changed || node->changed;
}
- SSET_FOR_EACH (as, &as_data->new) {
- if (!lflow_handle_changed_ref(REF_TYPE_ADDRSET, as,
+ SSET_FOR_EACH (ref_name, new) {
+ if (!lflow_handle_changed_ref(ref_type, ref_name,
sbrec_multicast_group_by_name_datapath,
sbrec_port_binding_by_name,dhcp_table,
dhcpv6_table, logical_flow_table,
@@ -1555,6 +1623,18 @@ flow_output_addr_sets_handler(struct engine_node *node)
return true;
}
+static bool
+flow_output_addr_sets_handler(struct engine_node *node)
+{
+ return _flow_output_resource_ref_handler(node, REF_TYPE_ADDRSET);
+}
+
+static bool
+flow_output_port_groups_handler(struct engine_node *node)
+{
+ return _flow_output_resource_ref_handler(node, REF_TYPE_PORTGROUP);
+}
+
struct ovn_controller_exit_args {
bool *exiting;
bool *restart;
@@ -1672,11 +1752,13 @@ main(int argc, char *argv[])
engine_add_input(&en_addr_sets, &en_sb_address_set,
addr_sets_sb_address_set_handler);
- engine_add_input(&en_port_groups, &en_sb_port_group, NULL);
+ engine_add_input(&en_port_groups, &en_sb_port_group,
+ port_groups_sb_port_group_handler);
engine_add_input(&en_flow_output, &en_addr_sets,
flow_output_addr_sets_handler);
- engine_add_input(&en_flow_output, &en_port_groups, NULL);
+ engine_add_input(&en_flow_output, &en_port_groups,
+ flow_output_port_groups_handler);
engine_add_input(&en_flow_output, &en_runtime_data, NULL);
engine_add_input(&en_flow_output, &en_mff_ovn_geneve, NULL);
--
2.1.0
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
