github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10922 from wojtek-t/fix_proxy_2

Browse Source 
Fix service shell e2e test
This commit is contained in:
Victor Marmol 2015-07-08 11:34:03 -07:00
commit faa573f995
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
hack/e2e-suite/services.sh
View File

@ -228,7 +228,8 @@ function wait_for_service_up() {
local i local i
local found_pods local found_pods
echo "waiting for $1 at $2:$3" echo "waiting for $1 at $2:$3"
for i in $(seq 1 5); do # TODO: Reduce this interval once we have a sense for the latency distribution.
for i in $(seq 1 10); do
results=($(ssh-to-node "${test_node}" " results=($(ssh-to-node "${test_node}" "
set -e; set -e;
for i in $(seq -s' ' 1 $(($4*3))); do for i in $(seq -s' ' 1 $(($4*3))); do
@ -237,12 +238,12 @@ function wait_for_service_up() {
done | sort -n | uniq done | sort -n | uniq
")) "))
found_pods=$(sort_args "${results[@]:+${results[@]}}") found_pods=$(sort_args "${results[@]}")
if [[ "${found_pods}" == "$5" ]]; then if [[ "${found_pods}" == "$5" ]]; then
return return
fi fi
echo "expected '$5', got '${found_pods}': will try again" echo "expected '$5', got '${found_pods}': will try again"
sleep 3 # wait for endpoints to propagate sleep 5 # wait for endpoints to propagate
done done
error "$1: failed to verify portal from host" error "$1: failed to verify portal from host"
} }
@ -269,33 +270,29 @@ function wait_for_service_down() {
# $4: pod count # $4: pod count
# $5: pod IDs (sorted) # $5: pod IDs (sorted)
function verify_from_container() { function verify_from_container() {
local i
local found_pods
echo "waiting for $1 at $2:$3" echo "waiting for $1 at $2:$3"
# TODO: Reduce this interval once we have a sense for the latency distribution. # TODO: Reduce this interval once we have a sense for the latency distribution.
for x in {0..9}; do for i in $(seq 1 10); do
results=($(ssh-to-node "${test_node}" " results=($(ssh-to-node "${test_node}" "
set -e; set -e;
sudo docker pull gcr.io/google_containers/busybox >/dev/null; sudo docker pull gcr.io/google_containers/busybox >/dev/null;
sudo docker run gcr.io/google_containers/busybox sh -c ' sudo docker run gcr.io/google_containers/busybox sh -c '
for i in $(seq -s' ' 1 $(($4*3))); do for i in $(seq -s' ' 1 $(($4*3))); do
if wget -q -T 3 -O - http://$2:$3; then wget -q -T 1 -O - http://$2:$3;
echo echo;
else
exit 1
fi
done done
'" | sort -r -n | uniq)) \ '" | sort -n | uniq))
|| error "testing $1 VIP from container failed"
found_pods=$(sort_args "${results[@]}") found_pods=$(sort_args "${results[@]}")
if [[ "${found_pods}" == "$5" ]]; then if [[ "${found_pods}" == "$5" ]]; then
break return
fi fi
echo "waiting for services iteration $x" echo "expected '$5', got '${found_pods}': will try again"
sleep 5 sleep 5 # wait for endpoints to propagate
done done
if [[ "${found_pods}" != "$5" ]]; then error "$1: failed to verify portal from host"
echo "expected '$5', got '${found_pods}'"
error "$1: failed to verify VIP from container"
fi
} }
trap do_teardown EXIT trap do_teardown EXIT