| Message ID | 20220829145751.338992-1-aconole@redhat.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [ovs-dev] system-kmod-testsuite: allow for missing nf_conntrack_helper key | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/intel-ovs-compilation | success | test: success |
On 8/29/22 16:57, Aaron Conole wrote: > With 'netfilter: remove nf_conntrack_helper sysctl toggle' applied, the > nf_conntrack_helper sysctl knob is removed. The testsuite has been forcibly > disabling this knob anyway, but the use of sysctl will still error out > on an invalid key. By adding 'e' flag, sysctl command will ignore missing > keys. Could you, please, also add information about removal to the Documentation/ref/ovs-actions.7.rst ? > > Ref: https://lists.linuxfoundation.org/pipermail/ovs-dev/2022-August/397367.html Please, use the mail.openvswitch.org link instead. I guess, we can use a Reported-at tag here, since you reported the issue in the mail thread. Best regards, Ilya Maximets. > Signed-off-by: Aaron Conole <aconole@redhat.com> > --- > tests/system-kmod-macros.at | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at > index 9ee1b1059d..f0f61d42ca 100644 > --- a/tests/system-kmod-macros.at > +++ b/tests/system-kmod-macros.at > @@ -66,7 +66,7 @@ m4_define([CHECK_CONNTRACK], > [modprobe mod || echo "Module mod not loaded." > on_exit 'modprobe -r mod' > ]) > - sysctl -w net.netfilter.nf_conntrack_helper=0 > + sysctl -ew net.netfilter.nf_conntrack_helper=0 > on_exit 'ovstest test-netlink-conntrack flush' > ] > )
diff --git a/tests/system-kmod-macros.at b/tests/system-kmod-macros.at index 9ee1b1059d..f0f61d42ca 100644 --- a/tests/system-kmod-macros.at +++ b/tests/system-kmod-macros.at @@ -66,7 +66,7 @@ m4_define([CHECK_CONNTRACK], [modprobe mod || echo "Module mod not loaded." on_exit 'modprobe -r mod' ]) - sysctl -w net.netfilter.nf_conntrack_helper=0 + sysctl -ew net.netfilter.nf_conntrack_helper=0 on_exit 'ovstest test-netlink-conntrack flush' ] )
With 'netfilter: remove nf_conntrack_helper sysctl toggle' applied, the nf_conntrack_helper sysctl knob is removed. The testsuite has been forcibly disabling this knob anyway, but the use of sysctl will still error out on an invalid key. By adding 'e' flag, sysctl command will ignore missing keys. Ref: https://lists.linuxfoundation.org/pipermail/ovs-dev/2022-August/397367.html Signed-off-by: Aaron Conole <aconole@redhat.com> --- tests/system-kmod-macros.at | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)