From 7153981bfe584ae35644bbfa9ab57f76baa7a84d Mon Sep 17 00:00:00 2001 From: "Tim St. Clair" Date: Fri, 3 Jun 2016 16:37:58 -0700 Subject: [PATCH] Fix node e2e image pulling retry logic --- test/e2e_node/container_list.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/test/e2e_node/container_list.go b/test/e2e_node/container_list.go index 91b4f27920..102448d58f 100644 --- a/test/e2e_node/container_list.go +++ b/test/e2e_node/container_list.go @@ -63,11 +63,15 @@ func PrePullAllImages() error { err error output []byte ) - for i := maxImagePullRetries; i > 0; i++ { + for i := 0; i < maxImagePullRetries; i++ { + if i > 0 { + time.Sleep(imagePullRetryDelay) + } if output, err = exec.Command("docker", "pull", image).CombinedOutput(); err == nil { break } - time.Sleep(imagePullRetryDelay) + glog.Warningf("Failed to pull %s, retrying in %s (%d of %d): %v", + image, imagePullRetryDelay.String(), i+1, maxImagePullRetries, err) } if err != nil { glog.Warningf("Could not pre-pull image %s %v output: %s", image, err, output)