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

Remove internal retry in discovery_check_swarm_info because caller retries are already in place. 

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
This commit is contained in:
Dong Chen 2016-02-29 13:48:59 -08:00
parent b43a2c21c4
commit f5187e9938
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/integration/discovery/zk.bats
View File

@ -85,6 +85,8 @@ function teardown() {
# Check that we can add instances back to the cluster
start_docker 2
swarm_join "$DISCOVERY"
run docker_swarm info
echo $output
retry 10 1 discovery_check_swarm_info 2
}
@ -106,5 +108,7 @@ function teardown() {
# After a while, `join` and `manage` should reach the store.
retry 20 1 discovery_check_swarm_list "$DISCOVERY"
run docker_swarm info
echo $output
retry 20 1 discovery_check_swarm_info
}

4
test/integration/helpers.bash
View File

@ -92,7 +92,7 @@ function discovery_check_swarm_info() {
local host="$2"
[ -z "$host" ] && host="${SWARM_HOSTS[0]}"
retry 10 1 eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\""
eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\""
}
# Return true if all nodes has been validated
@ -107,7 +107,7 @@ function swarm_manage() {
swarm_manage_no_wait "$@"
# Wait for nodes to be discovered
discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}"
retry 10 1 discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}"
# All nodes passes pending state
retry 15 1 nodes_validated