From d313ba85a2922ee94903e13339121aef2dae7c00 Mon Sep 17 00:00:00 2001
From: hsc <hsc@8c4709b5-6ec9-48aa-a5cd-a96041d1645a>
Date: Thu, 20 Sep 2012 17:16:33 +0000
Subject: [PATCH] runcampaign: utilize ssh's ConnectionAttempts

... instead of implementing it yourself.

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

diff --git a/scripts/runcampaign.sh b/scripts/runcampaign.sh
index c11a949d..e1427065 100755
--- a/scripts/runcampaign.sh
+++ b/scripts/runcampaign.sh
@@ -14,8 +14,8 @@ SCRIPTDIR=$(readlink -f $(dirname $0))
 source $SCRIPTDIR/fail-env.sh
 
 CMD="killall -q client.sh || true; cd $FAIL_EXPERIMENT_TARGETDIR; ./multiple-clients.sh"
-SSH='ssh -o BatchMode=yes -o ConnectTimeout=60'
 CONNECTION_ATTEMPTS=2
+SSH="ssh -o BatchMode=yes -o ConnectTimeout=60 -o ConnectionAttempts=$CONNECTION_ATTEMPTS"
 
 # runcampaign.sh <campaignserver-binary>
 if [ ! -x "$1" ]; then echo "usage: $0 <campaignserver-binary>" >&2; exit 1; fi
@@ -36,15 +36,7 @@ do
 		NCLIENTS=
 	fi
 
-	(
-		for i in $(seq $CONNECTION_ATTEMPTS)
-		do
-			$SSH $h "$CMD $NCLIENTS" && break
-			# failed?  sleep 1-10s and retry.
-			sleep $(($RANDOM / (32768 / 10) + 1))
-			echo retrying $h ...
-		done
-	) &
+	$SSH $h "$CMD $NCLIENTS" &
 	disown
 done