Skip to content
Snippets Groups Projects
Commit 1b3874c2 authored by Josh Brooks's avatar Josh Brooks
Browse files

Merge branch 'feature/XX-3367/CleanServerQuit' into 'release'

Add integration check for closing server

Closes XX-3367

See merge request elixxir/integration!129
parents 11659822 25a1f4c2
No related branches found
No related tags found
1 merge request!4Release
...@@ -18,7 +18,7 @@ PIDVAL=$! ...@@ -18,7 +18,7 @@ PIDVAL=$!
echo "$PERMCMD -- $PIDVAL" echo "$PERMCMD -- $PIDVAL"
echo "STARTING SERVERS..." echo "STARTING SERVERS..."
PID_SERVER_KILLED=$!
for SERVERID in $(seq 3 -1 1) for SERVERID in $(seq 3 -1 1)
do do
IDX=$(($SERVERID - 1)) IDX=$(($SERVERID - 1))
...@@ -26,6 +26,9 @@ do ...@@ -26,6 +26,9 @@ do
$SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 & $SERVERCMD > $SERVERLOGS/server-$SERVERID.console 2>&1 &
PIDVAL=$! PIDVAL=$!
echo "$SERVERCMD -- $PIDVAL" echo "$SERVERCMD -- $PIDVAL"
if [ $SERVERID -eq 1 ]; then
PID_SERVER_KILLED=$PIDVAL
fi
if [ $SERVERID -eq 2 ]; then if [ $SERVERID -eq 2 ]; then
sleep 10 # This will force a CDE timeout sleep 10 # This will force a CDE timeout
fi fi
...@@ -82,6 +85,9 @@ diff -ruN results/gateway-errors.txt noerrors.txt ...@@ -82,6 +85,9 @@ diff -ruN results/gateway-errors.txt noerrors.txt
echo "NO OUTPUT ERRORS" echo "NO OUTPUT ERRORS"
echo "CHECKING THAT AT LEAST 2 ROUNDS RAN" echo "CHECKING THAT AT LEAST 2 ROUNDS RAN"
cat results/server-3.log | grep "RID 1 ReceiveFinishRealtime END" > rid.txt || true cat results/server-3.log | grep "RID 1 ReceiveFinishRealtime END" > rid.txt || true
if [ ! -s rid.txt ]; then if [ ! -s rid.txt ]; then
...@@ -89,5 +95,21 @@ if [ ! -s rid.txt ]; then ...@@ -89,5 +95,21 @@ if [ ! -s rid.txt ]; then
exit 42 exit 42
fi fi
# Kill the last server
echo "KILLING SERVER 0 EARLY"
kill -15 $PID_SERVER_KILLED
# Wait for node to handle kill signal
sleep 30
echo "CHECKING THAT SERVER 0 WAS KILLED PROPERLY"
cat results/server-1.log | grep "Round completed, closing!" > serverClose.txt || true
if [ -s serverClose.txt ]; then
echo "SERVER 0 CLOSED SUCCESSFULLY"
else
echo "SERVER 0 WAS NOT CLOSED PROPERLY"
exit 42
fi
tail $SERVERLOGS/*.console tail $SERVERLOGS/*.console
echo "SUCCESS!" echo "SUCCESS!"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment