Skip to content

Commit 9cff345

Browse files
committed
Do not swallow timeout in manageReplicas
1 parent cfb1389 commit 9cff345

File tree

3 files changed

+0
-30
lines changed

3 files changed

+0
-30
lines changed

pkg/controller/daemon/daemon_controller.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -957,16 +957,6 @@ func (dsc *DaemonSetsController) syncNodes(ds *apps.DaemonSet, podsToDelete, nod
957957
// this error since all subsequent creations will fail.
958958
return
959959
}
960-
if errors.IsTimeout(err) {
961-
// Pod is created but its initialization has timed out.
962-
// If the initialization is successful eventually, the
963-
// controller will observe the creation via the informer.
964-
// If the initialization fails, or if the pod keeps
965-
// uninitialized for a long time, the informer will not
966-
// receive any update, and the controller will create a new
967-
// pod when the expectation expires.
968-
return
969-
}
970960
}
971961
if err != nil {
972962
klog.V(2).Infof("Failed creation, decrementing expectations for set %q/%q", ds.Namespace, ds.Name)

pkg/controller/job/job_controller.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -777,16 +777,6 @@ func (jm *JobController) manageJob(activePods []*v1.Pod, succeeded int32, job *b
777777
// this error since all subsequent creations will fail.
778778
return
779779
}
780-
if errors.IsTimeout(err) {
781-
// Pod is created but its initialization has timed out.
782-
// If the initialization is successful eventually, the
783-
// controller will observe the creation via the informer.
784-
// If the initialization fails, or if the pod keeps
785-
// uninitialized for a long time, the informer will not
786-
// receive any update, and the controller will create a new
787-
// pod when the expectation expires.
788-
return
789-
}
790780
}
791781
if err != nil {
792782
defer utilruntime.HandleError(err)

pkg/controller/replicaset/replica_set.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -575,16 +575,6 @@ func (rsc *ReplicaSetController) manageReplicas(filteredPods []*v1.Pod, rs *apps
575575
// anything because any creation will fail
576576
return nil
577577
}
578-
if errors.IsTimeout(err) {
579-
// Pod is created but its initialization has timed out.
580-
// If the initialization is successful eventually, the
581-
// controller will observe the creation via the informer.
582-
// If the initialization fails, or if the pod keeps
583-
// uninitialized for a long time, the informer will not
584-
// receive any update, and the controller will create a new
585-
// pod when the expectation expires.
586-
return nil
587-
}
588578
}
589579
return err
590580
})

0 commit comments

Comments
 (0)