The northd_output node added the acl_id node as input twice. First it was added as an input with no change handler. Then later it was added as an input with a change handler.
This commit fixes the issue by adding acl_id only once, with the change handler. The only real effect this had was making for a bit of a confusing graph when visualizing the northd incremental engine. Signed-off-by: Mark Michelson <[email protected]> --- northd/inc-proc-northd.c | 5 ++--- tests/ovn-inc-proc-graph-dump.at | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/northd/inc-proc-northd.c b/northd/inc-proc-northd.c index b79272324..1884f98a0 100644 --- a/northd/inc-proc-northd.c +++ b/northd/inc-proc-northd.c @@ -480,7 +480,8 @@ void inc_proc_northd_init(struct ovsdb_idl_loop *nb, engine_add_input(&en_sync_from_sb, &en_sb_service_monitor, NULL); engine_add_input(&en_sync_from_sb, &en_sb_ha_chassis_group, NULL); - engine_add_input(&en_northd_output, &en_acl_id, NULL); + engine_add_input(&en_northd_output, &en_acl_id, + northd_output_acl_id_handler); engine_add_input(&en_northd_output, &en_sync_from_sb, NULL); engine_add_input(&en_northd_output, &en_sync_to_sb, northd_output_sync_to_sb_handler); @@ -492,8 +493,6 @@ void inc_proc_northd_init(struct ovsdb_idl_loop *nb, northd_output_fdb_aging_handler); engine_add_input(&en_northd_output, &en_ecmp_nexthop, northd_output_ecmp_nexthop_handler); - engine_add_input(&en_northd_output, &en_acl_id, - northd_output_acl_id_handler); engine_add_input(&en_northd_output, &en_advertised_route_sync, northd_output_advertised_route_sync_handler); engine_add_input(&en_northd_output, &en_advertised_mac_binding_sync, diff --git a/tests/ovn-inc-proc-graph-dump.at b/tests/ovn-inc-proc-graph-dump.at index a31aad6e7..2b751c987 100644 --- a/tests/ovn-inc-proc-graph-dump.at +++ b/tests/ovn-inc-proc-graph-dump.at @@ -235,14 +235,13 @@ digraph "Incremental-Processing-Engine" { SB_advertised_mac_binding -> advertised_mac_binding_sync [[label=""]]; northd -> advertised_mac_binding_sync [[label="engine_noop_handler"]]; northd_output [[style=filled, shape=box, fillcolor=white, label="northd_output"]]; - acl_id -> northd_output [[label=""]]; + acl_id -> northd_output [label="northd_output_acl_id_handler"]; sync_from_sb -> northd_output [[label=""]]; sync_to_sb -> northd_output [[label="northd_output_sync_to_sb_handler"]]; lflow -> northd_output [[label="northd_output_lflow_handler"]]; mac_binding_aging -> northd_output [[label="northd_output_mac_binding_aging_handler"]]; fdb_aging -> northd_output [[label="northd_output_fdb_aging_handler"]]; ecmp_nexthop -> northd_output [[label="northd_output_ecmp_nexthop_handler"]]; - acl_id -> northd_output [[label="northd_output_acl_id_handler"]]; advertised_route_sync -> northd_output [[label="northd_output_advertised_route_sync_handler"]]; advertised_mac_binding_sync -> northd_output [[label="northd_output_advertised_mac_binding_sync_handler"]]; } -- 2.52.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
