github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26825 from timstclair/node-e2e-pull 

Automatic merge from submit-queue

Fix node e2e image pulling retry logic
pull/6/head
k8s-merge-robot 2016-06-04 11:36:41 -07:00
parent 74aaa14390 7153981bfe
commit a2d79d0ef6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/e2e_node/container_list.go
View File

@ -63,11 +63,15 @@ func PrePullAllImages() error {
err error err error
output []byte 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 { if output, err = exec.Command("docker", "pull", image).CombinedOutput(); err == nil {
break 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 { if err != nil {
glog.Warningf("Could not pre-pull image %s %v output: %s", image, err, output) glog.Warningf("Could not pre-pull image %s %v output: %s", image, err, output)