On 1/8/24 16:40, Dumitru Ceara wrote: > Specifically the following commit: > 4102674b3e ovsdb-idl: Preserve change_seqno when deleting rows. > > Without it, in specific cases, the IDL might incorrectly report deletion > of yet to be seen records. > > Signed-off-by: Dumitru Ceara <[email protected]> > --- > NOTE: when backporting this, please make sure the corresponding OVS > branch-3.X versions of the submodule versions are used. The IDl fix is > backported to all required versions. > --- > controller/ofctrl.c | 2 +- > ovs | 2 +- > tests/test-ovn.c | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-)
I didn't test this much, but the change looks correct: Acked-by: Ilya Maximets <[email protected]> > > diff --git a/controller/ofctrl.c b/controller/ofctrl.c > index 7aac0128bc..cb460a2a47 100644 > --- a/controller/ofctrl.c > +++ b/controller/ofctrl.c > @@ -3045,7 +3045,7 @@ ofctrl_inject_pkt(const struct ovsrec_bridge *br_int, > const char *flow_s, > uint64_t packet_stub[128 / 8]; > struct dp_packet packet; > dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); > - flow_compose(&packet, &uflow, NULL, 64); > + flow_compose(&packet, &uflow, NULL, 64, false); > > uint64_t ofpacts_stub[1024 / 8]; > struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub); > diff --git a/ovs b/ovs > index fdbf0bb2ae..4102674b3e 160000 > --- a/ovs > +++ b/ovs > @@ -1 +1 @@ > -Subproject commit fdbf0bb2aed53e70b455eb1adcfda8d8278ea690 > +Subproject commit 4102674b3ecadb0e20e512cc661cddbbc4b3d1f6 > diff --git a/tests/test-ovn.c b/tests/test-ovn.c > index aaf2825edc..5326c6e692 100644 > --- a/tests/test-ovn.c > +++ b/tests/test-ovn.c > @@ -999,7 +999,7 @@ test_tree_shape_exhaustively(struct expr *expr, struct > shash *symtab, > > if (operation >= OP_FLOW) { > bool found = classifier_lookup(&cls, OVS_VERSION_MIN, > - &f, NULL) != NULL; > + &f, NULL, NULL) != NULL; > if (expected != found) { > struct ds expr_s, modified_s; > > @@ -1238,7 +1238,7 @@ test_expr_to_packets(struct ovs_cmdl_context *ctx > OVS_UNUSED) > uint64_t packet_stub[128 / 8]; > struct dp_packet packet; > dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); > - flow_compose(&packet, &uflow, NULL, 64); > + flow_compose(&packet, &uflow, NULL, 64, false); > > struct ds output = DS_EMPTY_INITIALIZER; > const uint8_t *buf = dp_packet_data(&packet); _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
