diff options
| author | Kevin Traynor <ktraynor@redhat.com> | 2021-11-23 14:00:23 +0000 |
|---|---|---|
| committer | Ilya Maximets <i.maximets@ovn.org> | 2021-12-07 15:10:36 +0100 |
| commit | 4a7b58163f08b102fb0e1e07a137d8bdc4648aaa (patch) | |
| tree | eeca312a2b9a926ab62bee3e93a373feac53530d | |
| parent | 09c4449b2d6a0c3379ddd5a436b6f5c78fd26252 (diff) | |
| download | openvswitch-4a7b58163f08b102fb0e1e07a137d8bdc4648aaa.tar.gz | |
alb.at: Increase time/warp.
It seems that on slow system with high concurrency and cpu contention
time/warp is not accurate enough for the ALB unit tests with the minimum
time/warp that was used to hit an amount of events. This results in some
intermittent test failures.
As those tests are just waiting for a certain amount of events to occur
and there is no functional change during that time let's do the time/warp
again with higher values.
With this no failures are seen in several hundred runs.
Fixes: a83a406096e9 ("dpif-netdev: Sync PMD ALB state with user commands.")
Reported-by: Ilya Maximets <i.maximets@ovn.org>
Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
| -rw-r--r-- | tests/alb.at | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/alb.at b/tests/alb.at index 25c91f158..2bef06f39 100644 --- a/tests/alb.at +++ b/tests/alb.at @@ -65,32 +65,32 @@ AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg]) # 1 pmds 2 rxqs get_log_next_line_num -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance nothing to do, not enough non-isolated PMDs or RxQs."]) # 2 pmds 2 rxq get_log_next_line_num AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-cpu-mask=0x3]) OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "There are 2 pmd threads on numa node"]) -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance nothing to do, not enough non-isolated PMDs or RxQs."]) # 2 pmds 3 rxqs get_log_next_line_num AT_CHECK([ovs-vsctl set interface p0 options:n_rxq=3]) -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance performing dry run."]) # 1 pmds 3 rxqs get_log_next_line_num AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-cpu-mask=0x1]) OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "There are 1 pmd threads on numa node"]) -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance nothing to do, not enough non-isolated PMDs or RxQs."]) # Same config as last time get_log_next_line_num -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance nothing to do, no configuration changes since last check."]) OVS_VSWITCHD_STOP @@ -146,25 +146,25 @@ AT_CHECK([ovs-appctl vlog/set dpif_netdev:dbg]) # Just to be sure it is still set to group AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-rxq-assign=group]) get_log_next_line_num -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance performing dry run."]) get_log_next_line_num AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-rxq-assign=cycles]) OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "mode changed to: 'cycles'"]) -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance performing dry run."]) get_log_next_line_num AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-rxq-assign=roundrobin]) OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "mode changed to: 'roundrobin'"]) -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance nothing to do, pmd-rxq-assign=roundrobin assignment type configured."]) get_log_next_line_num AT_CHECK([ovs-vsctl set Open_vSwitch . other_config:pmd-rxq-assign=group]) OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "mode changed to: 'group'"]) -ovs-appctl time/warp 60000 10000 +ovs-appctl time/warp 600000 10000 OVS_WAIT_UNTIL([tail -n +$LINENUM ovs-vswitchd.log | grep "PMD auto load balance performing dry run."]) OVS_VSWITCHD_STOP |