Add a timeout to allow replacement pod to become ready

This commit is contained in:
Anirudh
2017-03-14 11:24:56 -07:00
parent a91869a0c5
commit 7698196fa5

View File

@@ -136,7 +136,7 @@ const (
// How long pods have to become scheduled onto nodes // How long pods have to become scheduled onto nodes
podScheduledBeforeTimeout = PodListTimeout + (20 * time.Second) podScheduledBeforeTimeout = PodListTimeout + (20 * time.Second)
podRespondingTimeout = 2 * time.Minute podRespondingTimeout = 15 * time.Minute
ServiceRespondingTimeout = 2 * time.Minute ServiceRespondingTimeout = 2 * time.Minute
EndpointRegisterTimeout = time.Minute EndpointRegisterTimeout = time.Minute
@@ -1634,8 +1634,10 @@ func (r podProxyResponseChecker) CheckAllResponses() (done bool, err error) {
} }
if err != nil { if err != nil {
if ctx.Err() != nil { if ctx.Err() != nil {
Failf("Controller %s: Failed to Get from replica %d [%s]: %v\n pod status: %#v", r.controllerName, i+1, pod.Name, err, pod.Status) // We may encounter errors here because of a race between the pod readiness and apiserver
return false, err // proxy. So, we log the error and retry if this occurs.
Logf("Controller %s: Failed to Get from replica %d [%s]: %v\n pod status: %#v", r.controllerName, i+1, pod.Name, err, pod.Status)
return false, nil
} }
Logf("Controller %s: Failed to GET from replica %d [%s]: %v\npod status: %#v", r.controllerName, i+1, pod.Name, err, pod.Status) Logf("Controller %s: Failed to GET from replica %d [%s]: %v\npod status: %#v", r.controllerName, i+1, pod.Name, err, pod.Status)
continue continue