From fcd1f62b82a2c027e0318eea3ae83aa2ac4d1a4b Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Thu, 1 Jul 2021 15:28:03 -0700
Subject: [PATCH] Move server kill command down
---
smokeinfra/run.sh | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/smokeinfra/run.sh b/smokeinfra/run.sh
index a35a8ae..8aa6943 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
--
GitLab