| Message ID | 20220722123357.66209-1-amusil@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [ovs-dev] system-tests: Reduce flakiness of IPv6 prefix delegation | expand |
| Context | Check | Description |
|---|---|---|
| ovsrobot/apply-robot | success | apply and check: success |
| ovsrobot/github-robot-_Build_and_Test | success | github build: passed |
| ovsrobot/github-robot-_ovn-kubernetes | fail | github build: failed |
Hi Ales, thanks for the change. It looks good to me. Acked-by: Mark Michelson <mmichels@redhat.com> On 7/22/22 08:33, Ales Musil wrote: > If one of the permutations failed, others running after > that would also fail because of leftover dhcpd running. > Make sure that dhcpd is killed if it's still running > since previous test. > > Reported-at: https://bugzilla.redhat.com/2108726 > Signed-off-by: Ales Musil <amusil@redhat.com> > --- > tests/system-ovn.at | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > index 066eab19b..de1652eee 100644 > --- a/tests/system-ovn.at > +++ b/tests/system-ovn.at > @@ -5270,6 +5270,16 @@ ovn-nbctl set logical_router_port rp-public options:prefix=true > ovn-nbctl set logical_router_port rp-sw0 options:prefix=true > ovn-nbctl set logical_router_port rp-sw1 options:prefix=true > > +OVN_POPULATE_ARP > + > +ovn-nbctl --wait=hv sync > + > +dhcpd_pid=$(pidof dhcpd) > +if $(test "$dhcpd_pid" != "") ; then > + echo "Leftover dhcpd was running!"; > + kill -9 $dhcpd_pid > +fi > + > cat > /etc/dhcp/dhcpd.conf <<EOF > option dhcp-rebinding-time 15; > option dhcp-renewal-time 10; > @@ -5320,7 +5330,7 @@ OVS_WAIT_UNTIL([ > test "${total_pkts}" = "1" > ]) > > -kill $(pidof dhcpd) > +kill -9 $(pidof dhcpd) > kill $(pidof tcpdump) > > ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
Hi Mark, thank you for the review, I have posted v2 after suggestion from Ilya to use NETNS_DAEMONIZE instead of the pidof + kill check. Thanks, Ales On Fri, Jul 22, 2022 at 8:29 PM Mark Michelson <mmichels@redhat.com> wrote: > Hi Ales, thanks for the change. It looks good to me. > > Acked-by: Mark Michelson <mmichels@redhat.com> > > On 7/22/22 08:33, Ales Musil wrote: > > If one of the permutations failed, others running after > > that would also fail because of leftover dhcpd running. > > Make sure that dhcpd is killed if it's still running > > since previous test. > > > > Reported-at: https://bugzilla.redhat.com/2108726 > > Signed-off-by: Ales Musil <amusil@redhat.com> > > --- > > tests/system-ovn.at | 12 +++++++++++- > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/tests/system-ovn.at b/tests/system-ovn.at > > index 066eab19b..de1652eee 100644 > > --- a/tests/system-ovn.at > > +++ b/tests/system-ovn.at > > @@ -5270,6 +5270,16 @@ ovn-nbctl set logical_router_port rp-public > options:prefix=true > > ovn-nbctl set logical_router_port rp-sw0 options:prefix=true > > ovn-nbctl set logical_router_port rp-sw1 options:prefix=true > > > > +OVN_POPULATE_ARP > > + > > +ovn-nbctl --wait=hv sync > > + > > +dhcpd_pid=$(pidof dhcpd) > > +if $(test "$dhcpd_pid" != "") ; then > > + echo "Leftover dhcpd was running!"; > > + kill -9 $dhcpd_pid > > +fi > > + > > cat > /etc/dhcp/dhcpd.conf <<EOF > > option dhcp-rebinding-time 15; > > option dhcp-renewal-time 10; > > @@ -5320,7 +5330,7 @@ OVS_WAIT_UNTIL([ > > test "${total_pkts}" = "1" > > ]) > > > > -kill $(pidof dhcpd) > > +kill -9 $(pidof dhcpd) > > kill $(pidof tcpdump) > > > > ovn-nbctl set logical_router_port rp-sw0 options:prefix=false > >
diff --git a/tests/system-ovn.at b/tests/system-ovn.at index 066eab19b..de1652eee 100644 --- a/tests/system-ovn.at +++ b/tests/system-ovn.at @@ -5270,6 +5270,16 @@ ovn-nbctl set logical_router_port rp-public options:prefix=true ovn-nbctl set logical_router_port rp-sw0 options:prefix=true ovn-nbctl set logical_router_port rp-sw1 options:prefix=true +OVN_POPULATE_ARP + +ovn-nbctl --wait=hv sync + +dhcpd_pid=$(pidof dhcpd) +if $(test "$dhcpd_pid" != "") ; then + echo "Leftover dhcpd was running!"; + kill -9 $dhcpd_pid +fi + cat > /etc/dhcp/dhcpd.conf <<EOF option dhcp-rebinding-time 15; option dhcp-renewal-time 10; @@ -5320,7 +5330,7 @@ OVS_WAIT_UNTIL([ test "${total_pkts}" = "1" ]) -kill $(pidof dhcpd) +kill -9 $(pidof dhcpd) kill $(pidof tcpdump) ovn-nbctl set logical_router_port rp-sw0 options:prefix=false
If one of the permutations failed, others running after that would also fail because of leftover dhcpd running. Make sure that dhcpd is killed if it's still running since previous test. Reported-at: https://bugzilla.redhat.com/2108726 Signed-off-by: Ales Musil <amusil@redhat.com> --- tests/system-ovn.at | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)