ofproto.at: Workaround a race
authorYAMAMOTO Takashi <yamamoto@midokura.com>
Wed, 14 Oct 2015 18:41:41 +0000 (18:41 +0000)
committerYAMAMOTO Takashi <yamamoto@midokura.com>
Thu, 26 Nov 2015 09:37:37 +0000 (18:37 +0900)
While a barrier serializes requests from the same connection,
it doesn't wait for requests from other connections to the switch.
Replace the barrier with infamous "sleep 1" to workaround the problem.

Signed-off-by: YAMAMOTO Takashi <yamamoto@midokura.com>
Acked-by: Ben Pfaff <blp@ovn.org>
tests/ofproto.at

index aef7f0c..0a36290 100644 (file)
@@ -2438,8 +2438,7 @@ udp,vlan_tci=0x0000,dl_src=00:26:b9:8c:b0:f9,dl_dst=00:25:83:df:b4:00,nw_src=172
     fi
     AT_FAIL_IF([test X"$1" != X])
 
-    ovs-appctl -t ovs-ofctl ofctl/barrier
-    echo >>expout "OFPT_BARRIER_REPLY (OF1.2):"
+    sleep 1
 
     AT_CHECK(
       [[sed '