Commit 82b9d2fb authored by Leigh Stoller's avatar Leigh Stoller

Fighting more weird race conditions. Just throwing rocks.

parent 3999f22e
......@@ -52,10 +52,17 @@ fi
#
# Note timeout; we do not want the proxy to ever get stuck.
#
rm -f /var/emulab/logs/tmccproxy.$vnodeid.log
rm -f $MYROOT/var/emulab/tmcc.sock
/usr/local/etc/emulab/tmcc -d -t 10 -x $MYROOT/var/emulab/tmcc.sock \
-n $vnodeid -o /var/emulab/logs/tmccproxy.$vnodeid.log >& /dev/null &
echo $! > /var/run/tmccproxy.$vnodeid.pid
echo "/var/emulab/tmcc.sock" > $MYROOT/var/emulab/boot/proxypath
# Hmm, give the proxy a chance to get running, lest the container
# start running before it can actually talk to tmcc.
sleep 2
exit $RETVAL
......@@ -59,6 +59,9 @@ if [ $ELABCTRLDEV = $DEV ]; then
else
$ROUTE add -host $ELABCTRLIP dev $ELABCTRLBR
fi
# Hmm, weird race. Sometimes the container starts with its
# control network not working right. This seems to help.
sleep 2
# no point continuing.
exit 0
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment