fmt_pkt: make sure scapy-server is started once

When running fmt_pkt in parallel, before the patch, there could be several attempts to start scapy-server. Using flock on a test case specific file should guarantee that only one of the subshells will actually be able to start a daemon, which is designed to be a singleton. Now that start_scapy_server doesn't necessarily start a server (only the first lucky subshell will do), wait for server socket file before proceeding with ovs-appctl call. Signed-off-by: Ihar Hrachyshka <[email protected]> Acked-by: Mark Michelson <[email protected]> Signed-off-by: Mark Michelson <[email protected]>
ovn-org · Dec 4, 2023 · a1408cc · a1408cc
1 parent dc9e823
commit a1408cc
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/tests/ovn-macros.at b/tests/ovn-macros.at
@@ -876,17 +876,19 @@ fmt_pkt() {
     if [[ ! -S $ctlfile ]]; then
         start_scapy_server
     fi
+    while [[ ! -S $ctlfile ]]; do sleep 0.1; done
     ovs-appctl -t $ctlfile payload "$1"
 }
 
 start_scapy_server() {
     pidfile=$ovs_base/scapy.pid
     ctlfile=$ovs_base/scapy.ctl
     logfile=$ovs_base/scapy.log
+    lockfile=$ovs_base/scapy.lock
 
-    "$top_srcdir"/tests/scapy-server.py \
-        --pidfile=$pidfile --unixctl=$ctlfile --log-file=$logfile --detach
-    on_exit "test -e \"$pidfile\" && ovs-appctl -t $ctlfile exit"
+    flock -n $lockfile "$top_srcdir"/tests/scapy-server.py \
+        --pidfile=$pidfile --unixctl=$ctlfile --log-file=$logfile --detach \
+    && on_exit "test -e \"$pidfile\" && ovs-appctl -t $ctlfile exit"
 }
 
 sleep_sb() {