Merge pull request #49494 from shyamjvs/kubemark-fix

Automatic merge from submit-queue (batch tested with PRs 48636, 49088, 49251, 49417, 49494) Fix bug in command retrying in kubemark This should fix some of the flakes mentioned in https://github.com/kubernetes/kubernetes/issues/46195. It's showing that all subsequent retries have failed if the first one failed due to `ret_val` not being reassigned on success. @bskiba Thanks for noticing :)

Merge pull request #49494 from shyamjvs/kubemark-fix
647c0033 · Kubernetes Submit Queue · GitHub · 0dfc696d · 55527036 · 647c0033
Commit 647c0033 authored Jul 24, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

util.sh test/kubemark/common/util.sh +2 -1

No files found.
--- a/test/kubemark/common/util.sh
+++ b/test/kubemark/common/util.sh
@@ -18,10 +18,11 @@
 function run-cmd-with-retries {
  RETRIES="${RETRIES:-3}"
  for attempt in $(seq 1 ${RETRIES}); do
+    local ret_val=0
    exec 5>&1 # Duplicate &1 to &5 for use below.
    # We don't use 'local' to declare result as then ret_val always gets value 0.
    # We use tee to output to &5 (redirected to stdout) while also storing it in the variable.
-    result=$("$@" 2>&1 | tee >(cat - >&5)) || local ret_val="$?"
+    result=$("$@" 2>&1 | tee >(cat - >&5)) || ret_val="$?"
    if [[ "${ret_val:-0}" -ne "0" ]]; then
      if [[ $(echo "${result}" | grep -c "already exists") -gt 0 ]]; then
        if [[ "${attempt}" == 1 ]]; then