github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Add pending status for pastBackoffLimitOnFailure

Browse Source
This commit is contained in:
Fei Xu 2019-05-09 15:40:07 +08:00 committed by fisherxu
parent e9af72c6e9
commit 9feb0df370
2 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/controller/job/job_controller.go
View File

@ -631,16 +631,15 @@ func pastBackoffLimitOnFailure(job *batch.Job, pods []*v1.Pod) bool {
result := int32(0) result := int32(0)
for i := range pods { for i := range pods {
po := pods[i] po := pods[i]
if po.Status.Phase != v1.PodRunning { if po.Status.Phase == v1.PodRunning || po.Status.Phase == v1.PodPending {
continue for j := range po.Status.InitContainerStatuses {
} stat := po.Status.InitContainerStatuses[j]
for j := range po.Status.InitContainerStatuses { result += stat.RestartCount
stat := po.Status.InitContainerStatuses[j] }
result += stat.RestartCount for j := range po.Status.ContainerStatuses {
} stat := po.Status.ContainerStatuses[j]
for j := range po.Status.ContainerStatuses { result += stat.RestartCount
stat := po.Status.ContainerStatuses[j] }
result += stat.RestartCount
} }
} }
if *job.Spec.BackoffLimit == 0 { if *job.Spec.BackoffLimit == 0 {

36
pkg/controller/job/job_controller_test.go
View File

@ -1414,6 +1414,7 @@ func TestJobBackoffForOnFailure(t *testing.T) {
// pod setup // pod setup
jobKeyForget bool jobKeyForget bool
restartCounts []int32 restartCounts []int32
podPhase v1.PodPhase
// expectations // expectations
expectedActive int32 expectedActive int32
@ -1424,32 +1425,47 @@ func TestJobBackoffForOnFailure(t *testing.T) {
}{ }{
"backoffLimit 0 should have 1 pod active": { "backoffLimit 0 should have 1 pod active": {
1, 1, 0, 1, 1, 0,
true, []int32{0}, true, []int32{0}, v1.PodRunning,
1, 0, 0, nil, "", 1, 0, 0, nil, "",
}, },
"backoffLimit 1 with restartCount 0 should have 1 pod active": { "backoffLimit 1 with restartCount 0 should have 1 pod active": {
1, 1, 1, 1, 1, 1,
true, []int32{0}, true, []int32{0}, v1.PodRunning,
1, 0, 0, nil, "", 1, 0, 0, nil, "",
}, },
"backoffLimit 1 with restartCount 1 should have 0 pod active": { "backoffLimit 1 with restartCount 1 and podRunning should have 0 pod active": {
1, 1, 1, 1, 1, 1,
true, []int32{1}, true, []int32{1}, v1.PodRunning,
0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded", 0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded",
}, },
"too many job failures - single pod": { "backoffLimit 1 with restartCount 1 and podPending should have 0 pod active": {
1, 1, 1,
true, []int32{1}, v1.PodPending,
0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded",
},
"too many job failures with podRunning - single pod": {
1, 5, 2, 1, 5, 2,
true, []int32{2}, true, []int32{2}, v1.PodRunning,
0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded", 0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded",
}, },
"too many job failures - multiple pods": { "too many job failures with podPending - single pod": {
1, 5, 2,
true, []int32{2}, v1.PodPending,
0, 0, 1, &jobConditionFailed, "BackoffLimitExceeded",
},
"too many job failures with podRunning - multiple pods": {
2, 5, 2, 2, 5, 2,
true, []int32{1, 1}, true, []int32{1, 1}, v1.PodRunning,
0, 0, 2, &jobConditionFailed, "BackoffLimitExceeded",
},
"too many job failures with podPending - multiple pods": {
2, 5, 2,
true, []int32{1, 1}, v1.PodPending,
0, 0, 2, &jobConditionFailed, "BackoffLimitExceeded", 0, 0, 2, &jobConditionFailed, "BackoffLimitExceeded",
}, },
"not enough failures": { "not enough failures": {
2, 5, 3, 2, 5, 3,
true, []int32{1, 1}, true, []int32{1, 1}, v1.PodRunning,
2, 0, 0, nil, "", 2, 0, 0, nil, "",
}, },
} }
@ -1474,7 +1490,7 @@ func TestJobBackoffForOnFailure(t *testing.T) {
job.Spec.Template.Spec.RestartPolicy = v1.RestartPolicyOnFailure job.Spec.Template.Spec.RestartPolicy = v1.RestartPolicyOnFailure
sharedInformerFactory.Batch().V1().Jobs().Informer().GetIndexer().Add(job) sharedInformerFactory.Batch().V1().Jobs().Informer().GetIndexer().Add(job)
podIndexer := sharedInformerFactory.Core().V1().Pods().Informer().GetIndexer() podIndexer := sharedInformerFactory.Core().V1().Pods().Informer().GetIndexer()
for i, pod := range newPodList(int32(len(tc.restartCounts)), v1.PodRunning, job) { for i, pod := range newPodList(int32(len(tc.restartCounts)), tc.podPhase, job) {
pod.Status.ContainerStatuses = []v1.ContainerStatus{{RestartCount: tc.restartCounts[i]}} pod.Status.ContainerStatuses = []v1.ContainerStatus{{RestartCount: tc.restartCounts[i]}}
podIndexer.Add(&pod) podIndexer.Add(&pod)
} }