| Message ID | 20221020122359.2967776-1-xsimonar@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [ovs-dev,branch-22.09] ovs: Bump submodule to tip of branch-3.0 and add related test | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | fail | apply and check: fail |
On 10/20/22 14:23, Xavier Simonart wrote: > Specifically for: > e379e42d47f8 ("ovsdb-idl: Preserve references for rows deleted in same IDL run as their insertion.") > > A OVN test case reproducing the bug (issue when port_binding is added/deleted within the > same IDL) is also added. > > Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2126450 > > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > --- > ovs | 2 +- > tests/ovn.at | 29 +++++++++++++++++++++++++++++ > 2 files changed, 30 insertions(+), 1 deletion(-) > > diff --git a/ovs b/ovs > index 6f24c2bc7..64b79581b 160000 > --- a/ovs > +++ b/ovs > @@ -1 +1 @@ > -Subproject commit 6f24c2bc769afde0a390ce344de1a7d9c592e5a6 > +Subproject commit 64b79581be012db6053e9caead4090f5becbc3b8 Thanks Xavier for the backport! Acked-by: Dumitru Ceara <dceara@redhat.com> Mark, Numan, Han, I would like to backport this further down to 22.06 and 22.03 but we need to align our CI on those branches to what we have on 22.09 and newer. Otherwise we will be triggering a false positive memleak report when compiling OVS with -O2 (as Xavier pointed out privately). Ideally, we should run the same CI as on newer branches so I ended up with these additional commits to backport to 22.06 and 22.03: f14e3a48e4 ci: Add missing tests after switch to parallel jobs 4d93844b78 OVN-CI: ovn unit tests run in parallel jobs. 78eb7a48ba CI-Actions: define matrix as a list ef9a20b9a5 ci: Use CFLAGS instead of OVS_CFLAGS af37658768 Build tests with asan and ubsan together to reduce CI time. e921402c59 ci: Add UB Sanitizer. It's all mainly CI related work (no functional changes) so, if everyone agrees, I can take care of the backport to all stable branches. Here are links to my github fork if that makes it easier to review: https://github.com/dceara/ovn/commits/idl-fix-branch-22.06 https://github.com/dceara/ovn/commits/idl-fix-branch-22.03 I'll wait for a sign before pushing all these. Regards, Dumitru
+1 On Thu, Oct 20, 2022 at 8:05 AM Dumitru Ceara <dceara@redhat.com> wrote: > On 10/20/22 14:23, Xavier Simonart wrote: > > Specifically for: > > e379e42d47f8 ("ovsdb-idl: Preserve references for rows deleted in same > IDL run as their insertion.") > > > > A OVN test case reproducing the bug (issue when port_binding is > added/deleted within the > > same IDL) is also added. > > > > Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2126450 > > > > Signed-off-by: Xavier Simonart <xsimonar@redhat.com> > > --- > > ovs | 2 +- > > tests/ovn.at | 29 +++++++++++++++++++++++++++++ > > 2 files changed, 30 insertions(+), 1 deletion(-) > > > > diff --git a/ovs b/ovs > > index 6f24c2bc7..64b79581b 160000 > > --- a/ovs > > +++ b/ovs > > @@ -1 +1 @@ > > -Subproject commit 6f24c2bc769afde0a390ce344de1a7d9c592e5a6 > > +Subproject commit 64b79581be012db6053e9caead4090f5becbc3b8 > > Thanks Xavier for the backport! > > Acked-by: Dumitru Ceara <dceara@redhat.com> > > Mark, Numan, Han, I would like to backport this further down to 22.06 > and 22.03 but we need to align our CI on those branches to what we have > on 22.09 and newer. Otherwise we will be triggering a false positive > memleak report when compiling OVS with -O2 (as Xavier pointed out > privately). > > Ideally, we should run the same CI as on newer branches so I ended up > with these additional commits to backport to 22.06 and 22.03: > > f14e3a48e4 ci: Add missing tests after switch to parallel jobs > 4d93844b78 OVN-CI: ovn unit tests run in parallel jobs. > 78eb7a48ba CI-Actions: define matrix as a list > ef9a20b9a5 ci: Use CFLAGS instead of OVS_CFLAGS > af37658768 Build tests with asan and ubsan together to reduce CI time. > e921402c59 ci: Add UB Sanitizer. > > It's all mainly CI related work (no functional changes) so, if everyone > agrees, I can take care of the backport to all stable branches. > > Here are links to my github fork if that makes it easier to review: > https://github.com/dceara/ovn/commits/idl-fix-branch-22.06 > https://github.com/dceara/ovn/commits/idl-fix-branch-22.03 > > I'll wait for a sign before pushing all these. > > Regards, > Dumitru > >
On 10/20/22 17:12, Han Zhou wrote: > +1 Thanks for the sign! :) > > On Thu, Oct 20, 2022 at 8:05 AM Dumitru Ceara <dceara@redhat.com> wrote: > >> On 10/20/22 14:23, Xavier Simonart wrote: >>> Specifically for: >>> e379e42d47f8 ("ovsdb-idl: Preserve references for rows deleted in same >> IDL run as their insertion.") >>> >>> A OVN test case reproducing the bug (issue when port_binding is >> added/deleted within the >>> same IDL) is also added. >>> >>> Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2126450 >>> >>> Signed-off-by: Xavier Simonart <xsimonar@redhat.com> >>> --- >>> ovs | 2 +- >>> tests/ovn.at | 29 +++++++++++++++++++++++++++++ >>> 2 files changed, 30 insertions(+), 1 deletion(-) >>> >>> diff --git a/ovs b/ovs >>> index 6f24c2bc7..64b79581b 160000 >>> --- a/ovs >>> +++ b/ovs >>> @@ -1 +1 @@ >>> -Subproject commit 6f24c2bc769afde0a390ce344de1a7d9c592e5a6 >>> +Subproject commit 64b79581be012db6053e9caead4090f5becbc3b8 >> >> Thanks Xavier for the backport! >> >> Acked-by: Dumitru Ceara <dceara@redhat.com> >> >> Mark, Numan, Han, I would like to backport this further down to 22.06 >> and 22.03 but we need to align our CI on those branches to what we have >> on 22.09 and newer. Otherwise we will be triggering a false positive >> memleak report when compiling OVS with -O2 (as Xavier pointed out >> privately). >> >> Ideally, we should run the same CI as on newer branches so I ended up >> with these additional commits to backport to 22.06 and 22.03: >> >> f14e3a48e4 ci: Add missing tests after switch to parallel jobs >> 4d93844b78 OVN-CI: ovn unit tests run in parallel jobs. >> 78eb7a48ba CI-Actions: define matrix as a list >> ef9a20b9a5 ci: Use CFLAGS instead of OVS_CFLAGS >> af37658768 Build tests with asan and ubsan together to reduce CI time. >> e921402c59 ci: Add UB Sanitizer. >> >> It's all mainly CI related work (no functional changes) so, if everyone >> agrees, I can take care of the backport to all stable branches. >> >> Here are links to my github fork if that makes it easier to review: >> https://github.com/dceara/ovn/commits/idl-fix-branch-22.06 >> https://github.com/dceara/ovn/commits/idl-fix-branch-22.03 >> >> I'll wait for a sign before pushing all these. I pushed all these to branches 22.09, 22.06, 22.03. Regards, Dumitru
Bleep bloop. Greetings Xavier Simonart, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. git-am: error: add_cacheinfo failed to refresh for path 'ovs'; merge aborting. error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ovs: Bump submodule to tip of branch-3.0 and add related test When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
diff --git a/ovs b/ovs index 6f24c2bc7..64b79581b 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit 6f24c2bc769afde0a390ce344de1a7d9c592e5a6 +Subproject commit 64b79581be012db6053e9caead4090f5becbc3b8 diff --git a/tests/ovn.at b/tests/ovn.at index 80e9192ca..dd72996dd 100644 --- a/tests/ovn.at +++ b/tests/ovn.at @@ -32889,3 +32889,32 @@ check ovn-nbctl --wait=hv sync OVN_CLEANUP([hv1]) AT_CLEANUP ]) + +OVN_FOR_EACH_NORTHD([ +AT_SETUP([ovn-controller: batch add port and delete port in same IDL]) +ovn_start +net_add n1 + +sim_add hv1 +as hv1 +ovs-vsctl add-br br-phys +ovn_attach n1 br-phys 192.168.0.1 +check ovs-vsctl add-port br-int p1 + +check ovs-vsctl set interface p1 external-ids:iface-id=sw0-port1 +check ovn-nbctl --wait=hv sync +ovn-appctl debug/pause +OVS_WAIT_UNTIL([test x$(as hv1 ovn-appctl -t ovn-controller debug/status) = "xpaused"]) + +check ovn-nbctl ls-add sw0 -- lsp-add sw0 sw0-port1 +check ovn-nbctl lsp-del sw0-port1 +check ovn-nbctl --wait=sb sync + +ovn-appctl debug/resume +check ovn-nbctl --wait=hv sync + +check ovn-nbctl ls-del sw0 +check ovn-nbctl --wait=hv sync +OVN_CLEANUP([hv1]) +AT_CLEANUP +])
Specifically for: e379e42d47f8 ("ovsdb-idl: Preserve references for rows deleted in same IDL run as their insertion.") A OVN test case reproducing the bug (issue when port_binding is added/deleted within the same IDL) is also added. Reported-at: https://bugzilla.redhat.com/show_bug.cgi?id=2126450 Signed-off-by: Xavier Simonart <xsimonar@redhat.com> --- ovs | 2 +- tests/ovn.at | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-)