From ab7b2bb1602789aa6bdd257a344427096ab600b2 Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Thu, 20 Sep 2012 17:19:49 +0000
Subject: [PATCH] kill them all and use ssh's ConnectionAttempts option

... instead of implementing this in bash.

git-svn-id: https://www4.informatik.uni-erlangen.de/i4svn/danceos/trunk/devel/fail@1669 8c4709b5-6ec9-48aa-a5cd-a96041d1645a
---
 scripts/killall-bochs.sh | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/scripts/killall-bochs.sh b/scripts/killall-bochs.sh
index f8a27304..1ff77cc5 100755
--- a/scripts/killall-bochs.sh
+++ b/scripts/killall-bochs.sh
@@ -15,8 +15,8 @@ SCRIPTDIR=$(readlink -f $(dirname $0))
 source $SCRIPTDIR/fail-env.sh
 
 CMD="killall -q client.sh"
-SSH='ssh -o BatchMode=yes -o ConnectTimeout=60'
 CONNECTION_ATTEMPTS=2
+SSH="ssh -o BatchMode=yes -o ConnectTimeout=60 -o ConnectionAttempts=$CONNECTION_ATTEMPTS"
 
 for h in $FAIL_EXPERIMENT_HOSTS
 do
@@ -29,13 +29,5 @@ do
 		NCLIENTS=
 	fi
 
-	(
-		for i in $(seq $CONNECTION_ATTEMPTS)
-		do
-			$SSH $h "$CMD" && break
-			# failed?  sleep 1-10s and retry.
-			sleep $(($RANDOM / (32768 / 10) + 1))
-			echo retrying $h ...
-		done
-	) &
+	$SSH $h "$CMD $NCLIENTS" &
 done