From 7500d706ad1051cbc6d05c037001a2ddaa9e208f Mon Sep 17 00:00:00 2001 From: Ron Lai Date: Mon, 18 Jul 2016 10:23:57 -0700 Subject: [PATCH] sync backoff logic --- pkg/kubelet/images/parallel_image_puller.go | 1 - pkg/kubelet/images/serialized_image_puller.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/kubelet/images/parallel_image_puller.go b/pkg/kubelet/images/parallel_image_puller.go index c2fe7b16f36..6e494de3416 100644 --- a/pkg/kubelet/images/parallel_image_puller.go +++ b/pkg/kubelet/images/parallel_image_puller.go @@ -119,7 +119,6 @@ func (puller *parallelImagePuller) pullImage(pod *api.Pod, container *api.Contai } } puller.logIt(ref, api.EventTypeNormal, events.PulledImage, logPrefix, fmt.Sprintf("Successfully pulled image %q", container.Image), glog.Info) - puller.backOff.DeleteEntry(backOffKey) puller.backOff.GC() return nil, "" } diff --git a/pkg/kubelet/images/serialized_image_puller.go b/pkg/kubelet/images/serialized_image_puller.go index 98cc6d06e3b..f90d0d290d3 100644 --- a/pkg/kubelet/images/serialized_image_puller.go +++ b/pkg/kubelet/images/serialized_image_puller.go @@ -103,7 +103,7 @@ func (puller *serializedImagePuller) pullImage(pod *api.Pod, container *api.Cont } } - backOffKey := fmt.Sprintf("%s_%s", pod.Name, container.Image) + backOffKey := fmt.Sprintf("%s_%s", pod.UID, container.Image) if puller.backOff.IsInBackOffSinceUpdate(backOffKey, puller.backOff.Clock.Now()) { msg := fmt.Sprintf("Back-off pulling image %q", container.Image) puller.logIt(ref, api.EventTypeNormal, events.BackOffPullImage, logPrefix, msg, glog.Info)