Fixes: bbd79471160a ("ovn-ic: Cancel contended ISB lock when ovn-ic is paused.")
Signed-off-by: Xavier Simonart <[email protected]>
---
tests/ovn-ic.at | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/ovn-ic.at b/tests/ovn-ic.at
index eb3b7efef..500630396 100644
--- a/tests/ovn-ic.at
+++ b/tests/ovn-ic.at
@@ -5561,6 +5561,8 @@ ovn_start az2
AS_BOX([az2 paused])
check as az2 ovn-appctl -t ic/ovn-ic pause
OVS_WAIT_UNTIL([test "x$(as az2 ovn-appctl -t ic/ovn-ic status)" = "xStatus:
paused"])
+# Wait for az1 receiving "locked" notification.
+OVS_WAIT_UNTIL([grep -q 'send notification, method="locked"'
ovn-ic-sb/ovsdb-server.log])
n1_lock_notif=$(grep -c 'send notification, method="locked"'
ovn-ic-sb/ovsdb-server.log)
AS_BOX([az1 paused])
@@ -5575,9 +5577,10 @@ AT_CHECK([test $n1_lock_notif -eq $n2_lock_notif])
n1_lock_acquired=$(grep -c 'OVN ISB lock acquired' az1/ic/ovn-ic.log)
AS_BOX([az1 resumed])
check as az1 ovn-appctl -t ic/ovn-ic resume
-n2_lock_acquired=$(grep -c 'OVN ISB lock acquired' az1/ic/ovn-ic.log)
-echo "$n1_lock_acquired before and $n2_lock_acquired after resuming az1"
-OVS_WAIT_UNTIL([test $n1_lock_acquired -ne $n2_lock_acquired])
+OVS_WAIT_UNTIL([
+ n2_lock_acquired=$(grep -c 'OVN ISB lock acquired' az1/ic/ovn-ic.log)
+ echo "$n1_lock_acquired before and $n2_lock_acquired after resuming az1"
+ test $n1_lock_acquired -ne $n2_lock_acquired])
OVN_CLEANUP_IC([az1], [az2])
--
2.47.1
_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
