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

swarm_manage should confirm nodes pass validation. 

Signed-off-by: Dong Chen <dongluo.chen@docker.com>
This commit is contained in:
Dong Chen 2016-01-26 18:46:08 -08:00
parent b3aab8455d
commit 0b6d390d66
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/integration/helpers.bash
View File

@ -85,7 +85,7 @@ function wait_until_reachable() {
retry 15 1 docker -H $1 info retry 15 1 docker -H $1 info
} }
# Returns true if all nodes have joined the swarm. # Returns true if all nodes have been added to swarm. Note some may be in pending state.
function discovery_check_swarm_info() { function discovery_check_swarm_info() {
local total="$1" local total="$1"
[ -z "$total" ] && total="${#HOSTS[@]}" [ -z "$total" ] && total="${#HOSTS[@]}"
@ -95,6 +95,12 @@ function discovery_check_swarm_info() {
retry 10 1 eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\"" retry 10 1 eval "docker -H $host info | grep -q -e \"Nodes: $total\" -e \"Offers: $total\""
} }
# Return true if all nodes has been validated
function nodes_validated() {
# Nodes are not in Pending state
[[ $(docker_swarm info | grep -c "Status: Pending") -eq 0 ]]
}
function swarm_manage() { function swarm_manage() {
local i=${#SWARM_MANAGE_PID[@]} local i=${#SWARM_MANAGE_PID[@]}
@ -102,6 +108,9 @@ function swarm_manage() {
# Wait for nodes to be discovered # Wait for nodes to be discovered
discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}" discovery_check_swarm_info "${#HOSTS[@]}" "${SWARM_HOSTS[$i]}"
# All nodes passes pending state
retry 5 1 nodes_validated
} }
# Start the swarm manager in background. # Start the swarm manager in background.