From e43a07ba6e8995c196d20841ea58208232a3ffd8 Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Fri, 10 Apr 2015 12:53:26 -0700 Subject: [PATCH] ovs-sandbox: add delay before running ovs-vsctl When running ovsdb-server under gdb, there is a race that ovs-vsctl command can be called before ovsdb-server is fully launched. This will cause ovs-vsctl to fail. This patch fixes this by delay issuing the ovs-vsctl command until ovsdb-server is fully launched. Signed-off-by: Andy Zhou Acked-by: Russell Bryant Acked-by: Ben Pfaff --- tutorial/ovs-sandbox | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index 251f021bc..ebee4a9fb 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -235,6 +235,18 @@ run ovsdb-tool create conf.db "$schema" rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ --remote=punix:"$sandbox"/db.sock +#Add a small delay to allow ovsdb-server to launch. +sleep 0.1 + +#Wait for ovsdb-server to finish launching. +if test ! -e "$sandbox"/db.sock; then + echo -n "Waiting for ovsdb-server to start..." + while test ! -e "$sandbox"/db.sock; do + sleep 1; + done + echo " Done" +fi + # Initialize database. run ovs-vsctl --no-wait -- init -- 2.20.1