Merge pull request #10364 from brendandburns/e2e2

Add some sleep to the verification loop.
This commit is contained in:
Maxwell Forbes 2015-06-25 16:31:07 -07:00
commit 24de9afded

View File

@ -278,20 +278,28 @@ function wait_for_service_down() {
# $5: pod IDs (sorted) # $5: pod IDs (sorted)
function verify_from_container() { function verify_from_container() {
echo "waiting for $1 at $2:$3" echo "waiting for $1 at $2:$3"
results=($(ssh-to-node "${test_node}" " # TODO: Reduce this interval once we have a sense for the latency distribution.
set -e; for x in {0..9}; do
sudo docker pull gcr.io/google_containers/busybox >/dev/null; results=($(ssh-to-node "${test_node}" "
sudo docker run gcr.io/google_containers/busybox sh -c ' set -e;
for i in $(seq -s' ' 1 $(($4*3))); do sudo docker pull gcr.io/google_containers/busybox >/dev/null;
if wget -q -T 3 -O - http://$2:$3; then sudo docker run gcr.io/google_containers/busybox sh -c '
echo for i in $(seq -s' ' 1 $(($4*3))); do
else if wget -q -T 3 -O - http://$2:$3; then
exit 1 echo
fi else
done exit 1
'" | sort -r -n | uniq)) \ fi
|| error "testing $1 VIP from container failed" done
found_pods=$(sort_args "${results[@]}") '" | sort -r -n | uniq)) \
|| error "testing $1 VIP from container failed"
found_pods=$(sort_args "${results[@]}")
if [[ "${found_pods}" == "$5" ]]; then
break
fi
echo "waiting for services iteration $x"
sleep 5
done
if [[ "${found_pods}" != "$5" ]]; then if [[ "${found_pods}" != "$5" ]]; then
echo "expected '$5', got '${found_pods}'" echo "expected '$5', got '${found_pods}'"
error "$1: failed to verify VIP from container" error "$1: failed to verify VIP from container"