| Message ID | 20220621114707.676857-1-i.maximets@ovn.org |
|---|---|
| State | Accepted |
| Commit | 1dbc3b9f344662876dd015b84fb1b88658da3ef0 |
| Headers | show |
| Series | [ovs-dev] drop-stats.at: Fix frequent failures of the recursion too deep test. | 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 6/21/22 13:47, Ilya Maximets wrote: > The test doesn't wait for old flows being revalidated before sending > the second packet. The packet hits old flows and doesn't increase the > new drop counter as a result. > > Solution is to wait for revalidators to clean up old flows. This fixes > frequent test failures on CirrusCI. > > Fixes: a13a0209750c ("userspace: Improved packet drop statistics.") > Signed-off-by: Ilya Maximets <i.maximets@ovn.org> > --- > tests/drop-stats.at | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tests/drop-stats.at b/tests/drop-stats.at > index f3e19cd83..1d3af98da 100644 > --- a/tests/drop-stats.at > +++ b/tests/drop-stats.at > @@ -83,6 +83,9 @@ AT_CHECK([ > ovs-ofctl -Oopenflow13 add-flows br0 flows.txt > ovs-ofctl -Oopenflow13 dump-flows br0 | ofctl_strip | sort | grep actions ], [0], [ignore]) > > +ovs-appctl time/warp 15000 > +AT_CHECK([ovs-appctl revalidator/wait]) > + > AT_CHECK([ > ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1e:2c:e9:2a:66:9e),ipv4(src=192.168.10.10,dst=192.168.10.30,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' > ], [0], [ignore]) Makes sense. Acked-by: Dumitru Ceara <dceara@redhat.com> Thanks!
On 6/24/22 16:19, Dumitru Ceara wrote: > On 6/21/22 13:47, Ilya Maximets wrote: >> The test doesn't wait for old flows being revalidated before sending >> the second packet. The packet hits old flows and doesn't increase the >> new drop counter as a result. >> >> Solution is to wait for revalidators to clean up old flows. This fixes >> frequent test failures on CirrusCI. >> >> Fixes: a13a0209750c ("userspace: Improved packet drop statistics.") >> Signed-off-by: Ilya Maximets <i.maximets@ovn.org> >> --- >> tests/drop-stats.at | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/tests/drop-stats.at b/tests/drop-stats.at >> index f3e19cd83..1d3af98da 100644 >> --- a/tests/drop-stats.at >> +++ b/tests/drop-stats.at >> @@ -83,6 +83,9 @@ AT_CHECK([ >> ovs-ofctl -Oopenflow13 add-flows br0 flows.txt >> ovs-ofctl -Oopenflow13 dump-flows br0 | ofctl_strip | sort | grep actions ], [0], [ignore]) >> >> +ovs-appctl time/warp 15000 >> +AT_CHECK([ovs-appctl revalidator/wait]) >> + >> AT_CHECK([ >> ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1e:2c:e9:2a:66:9e),ipv4(src=192.168.10.10,dst=192.168.10.30,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' >> ], [0], [ignore]) > > Makes sense. > > Acked-by: Dumitru Ceara <dceara@redhat.com> Thanks! Applied and backported down to 2.13. Best regards, Ilya Maximets.
diff --git a/tests/drop-stats.at b/tests/drop-stats.at index f3e19cd83..1d3af98da 100644 --- a/tests/drop-stats.at +++ b/tests/drop-stats.at @@ -83,6 +83,9 @@ AT_CHECK([ ovs-ofctl -Oopenflow13 add-flows br0 flows.txt ovs-ofctl -Oopenflow13 dump-flows br0 | ofctl_strip | sort | grep actions ], [0], [ignore]) +ovs-appctl time/warp 15000 +AT_CHECK([ovs-appctl revalidator/wait]) + AT_CHECK([ ovs-appctl netdev-dummy/receive p1 'in_port(1),packet_type(ns=0,id=0),eth(src=3a:6d:d2:09:9c:ab,dst=1e:2c:e9:2a:66:9e),ipv4(src=192.168.10.10,dst=192.168.10.30,proto=1,tos=0,ttl=64,frag=no),icmp(type=8,code=0)' ], [0], [ignore])
The test doesn't wait for old flows being revalidated before sending the second packet. The packet hits old flows and doesn't increase the new drop counter as a result. Solution is to wait for revalidators to clean up old flows. This fixes frequent test failures on CirrusCI. Fixes: a13a0209750c ("userspace: Improved packet drop statistics.") Signed-off-by: Ilya Maximets <i.maximets@ovn.org> --- tests/drop-stats.at | 3 +++ 1 file changed, 3 insertions(+)