docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "use retry to wait for swarm join" 

This reverts commit 89fe217e12.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>

Conflicts:
	test/integration/helpers.bash
This commit is contained in:
Andrea Luzzardi 2015-05-05 18:35:09 -07:00
parent bca0e2e8c2
commit bd3c5c3636
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/integration/helpers.bash
View File

@ -100,7 +100,24 @@ function swarm_join() {
SWARM_JOIN_PID[$i]=$!
((++i))
done
retry 30 1 [ -n "$(docker_swarm info | grep -q 'Nodes: $i')" ]
wait_until_swarm_joined $i
}
# Wait until a swarm instance joins the cluster.
# Parameter $1 is number of nodes to check.
function wait_until_swarm_joined {
local attempts=0
local max_attempts=10
until [ $attempts -ge $max_attempts ]; do
run docker -H $SWARM_HOST info
if [[ "${lines[3]}" == *"Nodes: $1"* ]]; then
break
fi
echo "Checking if joined successfully for the $((++attempts)) time" >&2
sleep 1
done
[[ $attempts -lt $max_attempts ]]
}
# Stops the manager.