Introduce Incremental Processing logic for en-datapath-logical-switch node. This patch is based on Mark's datapath-sync series: https://patchwork.ozlabs.org/project/ovn/cover/[email protected]/
Reported-at: https://issues.redhat.com/browse/FDP-1519 Signed-off-by: Lorenzo Bianconi <[email protected]> --- northd/datapath-sync.c | 16 +++ northd/datapath-sync.h | 4 + northd/en-datapath-logical-switch.c | 192 +++++++++++++++++++++------- northd/en-datapath-logical-switch.h | 2 + northd/inc-proc-northd.c | 6 +- tests/ovn-northd.at | 37 ++++++ 6 files changed, 211 insertions(+), 46 deletions(-) diff --git a/northd/datapath-sync.c b/northd/datapath-sync.c index 67a3cf3f3..735a9c74b 100644 --- a/northd/datapath-sync.c +++ b/northd/datapath-sync.c @@ -16,6 +16,8 @@ #include <config.h> #include "datapath-sync.h" +#include "openvswitch/hmap.h" +#include "ovn-util.h" static const char *ovn_datapath_strings [] = { [DP_SWITCH] = "logical-switch", @@ -44,6 +46,20 @@ ovn_datapath_type_to_string(enum ovn_datapath_type dp_type) return ovn_datapath_strings[dp_type]; } +struct ovn_unsynced_datapath * +ovn_unsynced_datapath_find(const struct ovn_unsynced_datapath_map *map, + const struct uuid *uuid, const char *name, + enum ovn_datapath_type type) +{ + struct ovn_unsynced_datapath *dp; + HMAP_FOR_EACH_WITH_HASH (dp, hmap_node, uuid_hash(uuid), &map->dps) { + if (dp->type == type && !strcmp(dp->name, name)) { + return dp; + } + } + return NULL; +} + struct ovn_unsynced_datapath * ovn_unsynced_datapath_alloc(const char *name, enum ovn_datapath_type type, uint32_t requested_tunnel_key, diff --git a/northd/datapath-sync.h b/northd/datapath-sync.h index efe4bb3e8..d0356e023 100644 --- a/northd/datapath-sync.h +++ b/northd/datapath-sync.h @@ -75,6 +75,10 @@ struct ovn_synced_datapaths { struct ovs_list synced_dps; }; +struct ovn_unsynced_datapath * +ovn_unsynced_datapath_find(const struct ovn_unsynced_datapath_map *map, + const struct uuid *uuid, const char *name, + enum ovn_datapath_type type); struct ovn_unsynced_datapath *ovn_unsynced_datapath_alloc( const char *name, enum ovn_datapath_type type, uint32_t requested_tunnel_key, const struct ovsdb_idl_row *nb_row); diff --git a/northd/en-datapath-logical-switch.c b/northd/en-datapath-logical-switch.c index 2ef2f7d9a..04c247156 100644 --- a/northd/en-datapath-logical-switch.c +++ b/northd/en-datapath-logical-switch.c @@ -38,65 +38,169 @@ en_datapath_logical_switch_init(struct engine_node *node OVS_UNUSED, return map; } -enum engine_node_state -en_datapath_logical_switch_run(struct engine_node *node , void *data) +static void +datapath_unsynced_new_logical_switch_handler( + const struct nbrec_logical_switch *nbs, + const struct ed_type_global_config *global_config, + struct ovn_unsynced_datapath_map *map) +{ + uint32_t requested_tunnel_key = smap_get_int(&nbs->other_config, + "requested-tnl-key", 0); + const char *ts = smap_get(&nbs->other_config, "interconn-ts"); + if (!ts && global_config->vxlan_mode && requested_tunnel_key >= 1 << 12) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + VLOG_WARN_RL(&rl, "Tunnel key %"PRIu32" for datapath %s is " + "incompatible with VXLAN", requested_tunnel_key, + nbs->name); + requested_tunnel_key = 0; + } + + struct ovn_unsynced_datapath *dp = + ovn_unsynced_datapath_alloc(nbs->name, DP_SWITCH, + requested_tunnel_key, &nbs->header_); + + smap_add(&dp->external_ids, "name", dp->name); + const char *neutron_network = smap_get(&nbs->other_config, + "neutron:network_name"); + if (neutron_network && neutron_network[0]) { + smap_add(&dp->external_ids, "name2", neutron_network); + } + + int64_t ct_zone_limit = ovn_smap_get_llong(&nbs->other_config, + "ct-zone-limit", -1); + if (ct_zone_limit > 0) { + smap_add_format(&dp->external_ids, "ct-zone-limit", "%"PRId64, + ct_zone_limit); + } + + if (ts) { + smap_add(&dp->external_ids, "interconn-ts", ts); + } + + uint32_t age_threshold = smap_get_uint(&nbs->other_config, + "fdb_age_threshold", 0); + if (age_threshold) { + smap_add_format(&dp->external_ids, "fdb_age_threshold", + "%u", age_threshold); + } + + /* For backwards-compatibility, also store the NB UUID in + * external-ids:logical-switch. This is useful if ovn-controller + * has not updated and expects this to be where to find the + * UUID. + */ + smap_add_format(&dp->external_ids, "logical-switch", UUID_FMT, + UUID_ARGS(&nbs->header_.uuid)); + + hmap_insert(&map->dps, &dp->hmap_node, uuid_hash(&nbs->header_.uuid)); +} + +enum engine_input_handler_result +datapath_logical_switch_handler(struct engine_node *node, void *data) { const struct nbrec_logical_switch_table *nb_ls_table = EN_OVSDB_GET(engine_get_input("NB_logical_switch", node)); const struct ed_type_global_config *global_config = engine_get_input_data("global_config", node); - + enum engine_input_handler_result ret = EN_HANDLED_UNCHANGED; struct ovn_unsynced_datapath_map *map = data; - ovn_unsynced_datapath_map_destroy(map); - ovn_unsynced_datapath_map_init(map, DP_SWITCH); - const struct nbrec_logical_switch *nbs; - NBREC_LOGICAL_SWITCH_TABLE_FOR_EACH (nbs, nb_ls_table) { - uint32_t requested_tunnel_key = smap_get_int(&nbs->other_config, - "requested-tnl-key", 0); - const char *ts = smap_get(&nbs->other_config, "interconn-ts"); - - if (!ts && global_config->vxlan_mode && - requested_tunnel_key >= 1 << 12) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - VLOG_WARN_RL(&rl, "Tunnel key %"PRIu32" for datapath %s is " - "incompatible with VXLAN", requested_tunnel_key, - nbs->name); - requested_tunnel_key = 0; - } + NBREC_LOGICAL_SWITCH_TABLE_FOR_EACH_TRACKED (nbs, nb_ls_table) { + struct ovn_unsynced_datapath *dp = + ovn_unsynced_datapath_find(map, &nbs->header_.uuid, nbs->name, + DP_SWITCH); - struct ovn_unsynced_datapath *dp; - dp = ovn_unsynced_datapath_alloc(nbs->name, DP_SWITCH, - requested_tunnel_key, &nbs->header_); + if (nbrec_logical_switch_is_new(nbs)) { + if (dp) { + return EN_UNHANDLED; + } + datapath_unsynced_new_logical_switch_handler(nbs, global_config, + map); + ret = EN_HANDLED_UPDATED; + } else if (nbrec_logical_switch_is_deleted(nbs)) { + if (!dp) { + return EN_UNHANDLED; + } + hmap_remove(&map->dps, &dp->hmap_node); + ovn_unsynced_datapath_destroy(dp); + free(dp); + ret = EN_HANDLED_UPDATED; + } else { + if (!dp) { + return EN_UNHANDLED; + } - smap_init(&dp->external_ids); - smap_add(&dp->external_ids, "name", dp->name); - const char *neutron_network = smap_get(&nbs->other_config, - "neutron:network_name"); - if (neutron_network && neutron_network[0]) { - smap_add(&dp->external_ids, "name2", neutron_network); - } + uint32_t requested_tunnel_key = + smap_get_int(&nbs->other_config, "requested-tnl-key", 0); + const char *ts = smap_get(&nbs->other_config, "interconn-ts"); + if (!ts && global_config->vxlan_mode && + requested_tunnel_key >= 1 << 12) { + requested_tunnel_key = 0; + } + if (dp->requested_tunnel_key != requested_tunnel_key) { + dp->requested_tunnel_key = requested_tunnel_key; + ret = EN_HANDLED_UPDATED; + } - int64_t ct_zone_limit = ovn_smap_get_llong(&nbs->other_config, - "ct-zone-limit", -1); - if (ct_zone_limit > 0) { - smap_add_format(&dp->external_ids, "ct-zone-limit", "%"PRId64, - ct_zone_limit); - } + struct smap external_ids = SMAP_INITIALIZER(&external_ids); + smap_add(&external_ids, "name", nbs->name); - if (ts) { - smap_add(&dp->external_ids, "interconn-ts", ts); - } + const char *neutron_network = smap_get(&nbs->other_config, + "neutron:network_name"); + if (neutron_network && neutron_network[0]) { + smap_add(&external_ids, "name2", neutron_network); + } + + int64_t ct_zone_limit = ovn_smap_get_llong(&nbs->other_config, + "ct-zone-limit", -1); + if (ct_zone_limit > 0) { + smap_add_format(&external_ids, "ct-zone-limit", "%"PRId64, + ct_zone_limit); + } + + if (ts) { + smap_add(&external_ids, "interconn-ts", ts); + } + + uint32_t age_threshold = smap_get_uint(&nbs->other_config, + "fdb_age_threshold", 0); + if (age_threshold) { + smap_add_format(&external_ids, "fdb_age_threshold", + "%u", age_threshold); + } + + smap_add_format(&external_ids, "logical-switch", UUID_FMT, + UUID_ARGS(&nbs->header_.uuid)); - uint32_t age_threshold = smap_get_uint(&nbs->other_config, - "fdb_age_threshold", 0); - if (age_threshold) { - smap_add_format(&dp->external_ids, "fdb_age_threshold", - "%u", age_threshold); + if (!smap_equal(&external_ids, &dp->external_ids)) { + smap_destroy(&dp->external_ids); + smap_clone(&dp->external_ids, &external_ids); + ret = EN_HANDLED_UPDATED; + } + smap_destroy(&external_ids); } + } + + return ret; +} + +enum engine_node_state +en_datapath_logical_switch_run(struct engine_node *node , void *data) +{ + const struct nbrec_logical_switch_table *nb_ls_table = + EN_OVSDB_GET(engine_get_input("NB_logical_switch", node)); + const struct ed_type_global_config *global_config = + engine_get_input_data("global_config", node); + + struct ovn_unsynced_datapath_map *map = data; + + ovn_unsynced_datapath_map_destroy(map); + ovn_unsynced_datapath_map_init(map, DP_SWITCH); - hmap_insert(&map->dps, &dp->hmap_node, uuid_hash(&nbs->header_.uuid)); + const struct nbrec_logical_switch *nbs; + NBREC_LOGICAL_SWITCH_TABLE_FOR_EACH (nbs, nb_ls_table) { + datapath_unsynced_new_logical_switch_handler(nbs, global_config, map); } return EN_UPDATED; diff --git a/northd/en-datapath-logical-switch.h b/northd/en-datapath-logical-switch.h index 1190b7be8..2347983e7 100644 --- a/northd/en-datapath-logical-switch.h +++ b/northd/en-datapath-logical-switch.h @@ -24,6 +24,8 @@ void *en_datapath_logical_switch_init(struct engine_node *, struct engine_arg *); +enum engine_input_handler_result +datapath_logical_switch_handler(struct engine_node *, void *data); enum engine_node_state en_datapath_logical_switch_run(struct engine_node *, void *data); void en_datapath_logical_switch_cleanup(void *data); diff --git a/northd/inc-proc-northd.c b/northd/inc-proc-northd.c index 4627a053c..21ba76db5 100644 --- a/northd/inc-proc-northd.c +++ b/northd/inc-proc-northd.c @@ -217,8 +217,10 @@ void inc_proc_northd_init(struct ovsdb_idl_loop *nb, engine_add_input(&en_acl_id, &en_nb_acl, NULL); engine_add_input(&en_acl_id, &en_sb_acl_id, NULL); - engine_add_input(&en_datapath_logical_switch, &en_nb_logical_switch, NULL); - engine_add_input(&en_datapath_logical_switch, &en_global_config, NULL); + engine_add_input(&en_datapath_logical_switch, &en_nb_logical_switch, + datapath_logical_switch_handler); + engine_add_input(&en_datapath_logical_switch, &en_global_config, + datapath_logical_switch_handler); engine_add_input(&en_datapath_logical_router, &en_nb_logical_router, NULL); diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at index 33cd8a4ae..dc75a60dc 100644 --- a/tests/ovn-northd.at +++ b/tests/ovn-northd.at @@ -14656,6 +14656,43 @@ AT_CHECK([grep "lr_in_dnat" lr1flows | ovn_strip_lflows | grep "30.0.0.1"], [0], AT_CLEANUP ]) +OVN_FOR_EACH_NORTHD_NO_HV([ +AT_SETUP([Datapath Logical switch incremental processing]) + +ovn_start +net_add n1 +sim_add hv1 +as hv1 +ovs-vsctl add-br br-phys +ovn_attach n1 br-phys 192.168.0.11 + +check ovn-sbctl chassis-add gw1 geneve 127.0.0.1 +check ovn-nbctl --wait=sb sync + +check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats +check ovn-nbctl --wait=sb ls-add sw0 +check_engine_stats datapath_logical_switch norecompute compute +CHECK_NO_CHANGE_AFTER_RECOMPUTE + +check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats +check ovn-nbctl --wait=sb set logical_switch sw0 other_config:fdb_age_threshold=5 +check_engine_stats datapath_logical_switch norecompute compute +CHECK_NO_CHANGE_AFTER_RECOMPUTE + +check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats +check ovn-nbctl --wait=sb set logical_switch sw0 other_config:requested-tnl-key=123 +check_engine_stats datapath_logical_switch norecompute compute +CHECK_NO_CHANGE_AFTER_RECOMPUTE + +check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats +check ovn-nbctl --wait=sb ls-del sw0 +check_engine_stats datapath_logical_switch norecompute compute +CHECK_NO_CHANGE_AFTER_RECOMPUTE + +OVN_CLEANUP([hv1]) +AT_CLEANUP +]) + AT_SETUP([RBAC -- Recover builtin role and permissions]) ovn_start -- 2.50.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
