On Wed, Jan 8, 2025 at 8:52 AM Lorenzo Bianconi
<[email protected]> wrote:
>
> Trigger a full recompute in lb_data_load_balancer_handler() if add-route
> option is toggled since it can't be managed incrementally for the
> moment.
>
> Reported-at: https://issues.redhat.com/browse/FDP-1045
> Signed-off-by: Lorenzo Bianconi <[email protected]>
Thanks Lorenzo, I applied this patch to main and backported to
branch-24.09 and 24.03
with the following changes in the test code. I covered this case for the
test - "Load balancer incremental processing".
---------------------------------------------------------
diff --git a/tests/ovn-northd.at b/tests/ovn-northd.at
index 93d5693897..edfd5764bb 100644
--- a/tests/ovn-northd.at
+++ b/tests/ovn-northd.at
@@ -11195,9 +11195,38 @@ check_engine_stats sync_to_sb_lb 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 load_balancer . options:add_route=true
+check_engine_stats lb_data recompute nocompute
+check_engine_stats northd recompute nocompute
+check_engine_stats lr_stateful recompute nocompute
+check_engine_stats lflow recompute nocompute
+check_engine_stats sync_to_sb_lb recompute nocompute
+CHECK_NO_CHANGE_AFTER_RECOMPUTE
+
check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
check ovn-nbctl --wait=sb set load_balancer . options:foo=bar
check_engine_stats lb_data norecompute compute
+check_engine_stats northd recompute nocompute
+check_engine_stats lr_stateful recompute nocompute
+check_engine_stats lflow recompute nocompute
+check_engine_stats sync_to_sb_lb recompute nocompute
+CHECK_NO_CHANGE_AFTER_RECOMPUTE
+check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
+
+check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
+check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
+check ovn-nbctl --wait=sb set load_balancer . options:add_route=false
+check_engine_stats lb_data recompute nocompute
+check_engine_stats northd recompute nocompute
+check_engine_stats lr_stateful recompute nocompute
+check_engine_stats lflow recompute nocompute
+check_engine_stats sync_to_sb_lb recompute nocompute
+CHECK_NO_CHANGE_AFTER_RECOMPUTE
+
+check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
+check as northd ovn-appctl -t ovn-northd inc-engine/clear-stats
+check ovn-nbctl --wait=sb set load_balancer . options:foo=barr
+check_engine_stats lb_data norecompute compute
check_engine_stats northd norecompute compute
check_engine_stats lr_stateful norecompute compute
check_engine_stats lflow norecompute compute
-------------------------------------------------------------------------
Numan
> ---
> northd/en-lb-data.c | 7 +++
> tests/system-ovn.at | 130 ++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 137 insertions(+)
>
> diff --git a/northd/en-lb-data.c b/northd/en-lb-data.c
> index 6ad3fbb35..3f5785c95 100644
> --- a/northd/en-lb-data.c
> +++ b/northd/en-lb-data.c
> @@ -181,6 +181,7 @@ lb_data_load_balancer_handler(struct engine_node *node,
> void *data)
> struct sset old_ips_v6 = SSET_INITIALIZER(&old_ips_v6);
> sset_swap(&lb->ips_v4, &old_ips_v4);
> sset_swap(&lb->ips_v6, &old_ips_v6);
> + bool routable = lb->routable;
> ovn_northd_lb_reinit(lb, tracked_lb);
> health_checks |= lb->health_checks;
> struct crupdated_lb *clb = add_crupdated_lb_to_tracked_data(
> @@ -208,6 +209,12 @@ lb_data_load_balancer_handler(struct engine_node *node,
> void *data)
>
> sset_destroy(&old_ips_v4);
> sset_destroy(&old_ips_v6);
> +
> + if (routable != lb->routable) {
> + /* If routable is toggled trigger a full recompute.
> + */
> + return false;
> + }
> }
> }
>
> diff --git a/tests/system-ovn.at b/tests/system-ovn.at
> index 19ec1eb8d..b4deddad9 100644
> --- a/tests/system-ovn.at
> +++ b/tests/system-ovn.at
> @@ -14721,3 +14721,133 @@ OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port
> patch-.*/d
> /connection dropped.*/d"])
> AT_CLEANUP
> ])
> +
> +OVN_FOR_EACH_NORTHD([
> +AT_SETUP([ovn -- Loadbalancer add-route option])
> +AT_KEYWORDS([ovnlb])
> +
> +ovn_start
> +
> +OVS_TRAFFIC_VSWITCHD_START()
> +ADD_BR([br-int])
> +
> +# Set external-ids in br-int needed for ovn-controller
> +ovs-vsctl \
> + -- set Open_vSwitch . external-ids:system-id=hv1 \
> + -- set Open_vSwitch .
> external-ids:ovn-remote=unix:$ovs_base/ovn-sb/ovn-sb.sock \
> + -- set Open_vSwitch . external-ids:ovn-encap-type=geneve \
> + -- set Open_vSwitch . external-ids:ovn-encap-ip=169.0.0.1 \
> + -- set bridge br-int fail-mode=secure
> other-config:disable-in-band=true
> +
> +start_daemon ovn-controller
> +
> +# Logical network:
> +# Two VMs
> +# * VM1 with IP address 192.168.100.5
> +# * VM2 with IP address 192.168.200.5
> +#
> +# VM1 connects to logical switch ls1. ls1 connects to logical router lr1.
> +# VM2 connects to logical switch ls2. ls2 connects to logical router lr2.
> +# lr1 and lr2 both connect to logical switch ls-pub.
> +# * lr1's interface that connects to ls-pub has IP address 172.18.2.110/24
> +# * lr2's interface that connects to ls-pub has IP address 172.18.1.173/24
> +#
> +# lr1 has the following attributes:
> +# * It has a DNAT rule that translates 172.18.2.11 to 192.168.100.5 (VM1)
> +#
> +# lr2 has the following attributes:
> +# * It has a DNAT rule that translates 172.18.2.12 to 192.168.200.5 (VM2)
> +#
> +# In this test, we want to ensure that a ping from VM1 to IP address
> 172.18.2.12 reaches VM2.
> +# When the NAT rules are set up, there should be MAC_Bindings created that
> allow for traffic
> +# to exit lr1, go through ls-pub, and reach the NAT external IP configured
> on lr2.
> +
> +check ovn-nbctl ls-add ls1
> +check ovn-nbctl lsp-add ls1 vm1 -- lsp-set-addresses vm1 "00:00:00:00:01:05
> 192.168.100.5"
> +
> +check ovn-nbctl ls-add ls2
> +check ovn-nbctl lsp-add ls2 vm2 -- lsp-set-addresses vm2 "00:00:00:00:02:05
> 192.168.200.5"
> +
> +check ovn-nbctl ls-add ls-pub
> +
> +check ovn-nbctl lr-add lr1
> +check ovn-nbctl lrp-add lr1 lr1-ls1 00:00:00:00:01:01 192.168.100.1/24
> +check ovn-nbctl lsp-add ls1 ls1-lr1 \
> + -- lsp-set-type ls1-lr1 router \
> + -- lsp-set-addresses ls1-lr1 router \
> + -- lsp-set-options ls1-lr1 router-port=lr1-ls1
> +
> +check ovn-nbctl lr-add lr2
> +check ovn-nbctl lrp-add lr2 lr2-ls2 00:00:00:00:02:01 192.168.200.1/24
> +check ovn-nbctl lsp-add ls2 ls2-lr2 \
> + -- lsp-set-type ls2-lr2 router \
> + -- lsp-set-addresses ls2-lr2 router \
> + -- lsp-set-options ls2-lr2 router-port=lr2-ls2
> +
> +check ovn-nbctl lrp-add lr1 lr1-ls-pub 00:00:00:00:03:01 172.18.2.110/24
> +check ovn-nbctl lrp-set-gateway-chassis lr1-ls-pub hv1
> +check ovn-nbctl lsp-add ls-pub ls-pub-lr1 \
> + -- lsp-set-type ls-pub-lr1 router \
> + -- lsp-set-addresses ls-pub-lr1 router \
> + -- lsp-set-options ls-pub-lr1 router-port=lr1-ls-pub
> +
> +check ovn-nbctl lrp-add lr2 lr2-ls-pub 00:00:00:00:03:02 172.18.1.173/24
> +check ovn-nbctl lrp-set-gateway-chassis lr2-ls-pub hv1
> +check ovn-nbctl lsp-add ls-pub ls-pub-lr2 \
> + -- lsp-set-type ls-pub-lr2 router \
> + -- lsp-set-addresses ls-pub-lr2 router \
> + -- lsp-set-options ls-pub-lr2 router-port=lr2-ls-pub
> +
> +# Putting --add-route on these NAT rules means there is no need to
> +# add any static routes.
> +check ovn-nbctl --add-route lr-nat-add lr1 dnat_and_snat 172.18.2.11
> 192.168.100.5
> +check ovn-nbctl lb-add lb0 172.18.1.12 192.168.200.5
> +check ovn-nbctl lr-lb-add lr2 lb0
> +
> +ADD_NAMESPACES(vm1)
> +ADD_VETH(vm1, vm1, br-int, "192.168.100.5/24", "00:00:00:00:01:05", \
> + "192.168.100.1")
> +
> +ADD_NAMESPACES(vm2)
> +ADD_VETH(vm2, vm2, br-int, "192.168.200.5/24", "00:00:00:00:02:05", \
> + "192.168.200.1")
> +
> +OVN_POPULATE_ARP
> +check ovn-nbctl --wait=hv sync
> +
> +AS_BOX([Testing a ping])
> +
> +NS_CHECK_EXEC([vm1], [ping -q -c 3 -i 0.3 -w 2 172.18.1.12 | FORMAT_PING], \
> +[0], [dnl
> +7 packets transmitted, 0 received, 100% packet loss, time 0ms
> +])
> +
> +check ovn-nbctl --wait=hv set load_balancer lb0 options:add_route=true
> +NS_CHECK_EXEC([vm1], [ping -q -c 3 -i 0.3 -w 2 172.18.1.12 | FORMAT_PING], \
> +[0], [dnl
> +3 packets transmitted, 3 received, 0% packet loss, time 0ms
> +])
> +
> +check ovn-nbctl --wait=hv set load_balancer lb0 options:add_route=false
> +NS_CHECK_EXEC([vm1], [ping -q -c 3 -i 0.3 -w 2 172.18.1.12 | FORMAT_PING], \
> +[0], [dnl
> +7 packets transmitted, 0 received, 100% packet loss, time 0ms
> +])
> +
> +OVS_APP_EXIT_AND_WAIT([ovn-controller])
> +
> +as ovn-sb
> +OVS_APP_EXIT_AND_WAIT([ovsdb-server])
> +
> +as ovn-nb
> +OVS_APP_EXIT_AND_WAIT([ovsdb-server])
> +
> +as northd
> +OVS_APP_EXIT_AND_WAIT([ovn-northd])
> +
> +as
> +OVS_TRAFFIC_VSWITCHD_STOP(["/failed to query port patch-.*/d
> +/connection dropped.*/d"])
> +
> +AT_CLEANUP
> +])
> --
> 2.47.1
>
> _______________________________________________
> dev mailing list
> [email protected]
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
