On Tue, Oct 10, 2023 at 3:36 PM Dumitru Ceara <dce...@redhat.com> wrote:
> On 9/26/23 17:18, Lorenzo Bianconi wrote: > > Introduce lr_datapath_group column in the load_balancer table of the SB > > db. > > Sync load_balancers applied to logical_routers to Load_Balancer table in > > the SouthBound database. > > > > Reviewed-by: Ales Musil <amu...@redhat.com> > > Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2193323 > > Signed-off-by: Lorenzo Bianconi <lorenzo.bianc...@redhat.com> > > --- > > Thanks, Lorenzo, Ales and Ilya! > > We ran this through scale tests internally (ovn-heater and OpenShift) > and didn't notice a worrying performance hit. I applied the patch to > main with the following minor changes: > > diff --git a/northd/northd.c b/northd/northd.c > index 00abf680f8..f5dabf70c0 100644 > --- a/northd/northd.c > +++ b/northd/northd.c > @@ -4652,13 +4652,12 @@ sync_lbs(struct ovsdb_idl_txn *ovnsb_txn, > sbrec_load_balancer_set_vips(sbrec_lb, > ovn_northd_lb_get_vips(lb_dps->lb)); > sbrec_load_balancer_set_protocol(sbrec_lb, > lb_dps->lb->nlb->protocol); > - if (lb_dpg) { > - sbrec_load_balancer_set_datapath_group(sbrec_lb, > lb_dpg->dp_group); > - } > - if (lb_lr_dpg) { > - sbrec_load_balancer_set_lr_datapath_group(sbrec_lb, > - > lb_lr_dpg->dp_group); > - } > + sbrec_load_balancer_set_datapath_group( > + sbrec_lb, lb_dpg ? lb_dpg->dp_group : NULL > + ); > + sbrec_load_balancer_set_lr_datapath_group( > + sbrec_lb, lb_lr_dpg ? lb_lr_dpg->dp_group : NULL > + ); > sbrec_load_balancer_set_options(sbrec_lb, &options); > /* Clearing 'datapaths' column, since 'dp_group' is in use. */ > sbrec_load_balancer_set_datapaths(sbrec_lb, NULL, 0); > diff --git a/ovn-sb.ovsschema b/ovn-sb.ovsschema > index a66db998f1..49407081a8 100644 > --- a/ovn-sb.ovsschema > +++ b/ovn-sb.ovsschema > @@ -1,7 +1,7 @@ > { > "name": "OVN_Southbound", > - "version": "20.27.4", > - "cksum": "146375056 30745", > + "version": "20.28.0", > + "cksum": "2567491918 30745", > "tables": { > "SB_Global": { > "columns": { > "columns": { > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > index 2b52d72231..d70ad89863 100644 > --- a/tests/system-ovn.at > +++ b/tests/system-ovn.at > @@ -11798,14 +11798,11 @@ check ovn-nbctl lsp-add public public-vm \ > ADD_NAMESPACES(sw0-vm) > ADD_VETH(sw0-vm, sw0-vm, br-int, "192.168.1.2/24", "00:00:01:01:02:04", \ > "192.168.1.1") > -OVS_WAIT_UNTIL([test "$(ip netns exec sw0-vm ip a | grep fe80 | grep > tentative)" = ""]) > > ADD_NAMESPACES(public-vm) > ADD_VETH(public-vm, public-vm, br-int, "172.16.1.2/24", > "00:00:02:01:02:04", \ > "172.16.1.1") > > -OVS_WAIT_UNTIL([test "$(ip netns exec public-vm ip a | grep fe80 | grep > tentative)" = ""]) > - > # Start webservers in 'server'. > OVS_START_L7([sw0-vm], [http]) > > @@ -11825,7 +11822,7 @@ OVS_WAIT_FOR_OUTPUT([ovs-appctl > dpctl/dump-conntrack | FORMAT_CT(172.16.1.150) | > 1 > ]) > > -check ovn-nbctl lb-del lb1 > +check ovn-nbctl --wait=hv lb-del lb1 > > OVS_WAIT_FOR_OUTPUT([ovs-appctl dpctl/dump-conntrack | > FORMAT_CT(172.16.1.150) | wc -l ], [0], [dnl > 0 > @@ -11845,7 +11842,7 @@ OVS_WAIT_FOR_OUTPUT([ovs-appctl > dpctl/dump-conntrack | FORMAT_CT(172.16.1.151) | > 1 > ]) > > -check ovn-nbctl lb-del lb2 > +check ovn-nbctl --wait=hv lb-del lb2 > > OVS_WAIT_FOR_OUTPUT([ovs-appctl dpctl/dump-conntrack | > FORMAT_CT(172.16.1.151) | wc -l ], [0], [dnl > 1 > --- > > Regards, > Dumitru > > Hi Dumitru, would you mind backporting this series to 23.09 too? This was posted way before any kind of freeze and it would be very nice to have it in 23.09. Thanks, Ales -- Ales Musil Senior Software Engineer - OVN Core Red Hat EMEA <https://www.redhat.com> amu...@redhat.com <https://red.ht/sig> _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
