diff --git a/smokeinfra/run.sh b/smokeinfra/run.sh index a35a8ae37573e63fbc71fce532ce9aea7293781e..8aa69436e2104a2e4ea56195e36dc5c340855070 100755 --- a/smokeinfra/run.sh +++ b/smokeinfra/run.sh @@ -72,13 +72,6 @@ while [ ! -s rid.txt ] && [ $cnt -lt 240 ]; do echo -n "." done -# Kill the last server -echo "KILLING SERVER 0" -echo $PID_SERVER_KILLED -kill -2 $PID_SERVER_KILLED -# Wait for node to handle kill signal -sleep 30 - echo "CHECKING OUTPUT FOR ERRORS" set +x @@ -102,6 +95,14 @@ if [ ! -s rid.txt ]; then exit 42 fi +# Kill the last server +echo "KILLING SERVER 0" +echo $PID_SERVER_KILLED +kill -2 $PID_SERVER_KILLED +# Wait for node to handle kill signal +sleep 30 + + echo "CHECKING THAT SERVER 0 WAS KILLED PROPERLY" cat $SERVERLOGS/server-0.log | grep "Round completed, closing!" > serverClose.txt || true if [ -s serverClose.txt ]; then