github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set small DefaultJobPodFailureBackOff in Job integration tests

Browse Source
This commit is contained in:
Michal Wozniak
2023-06-19 14:27:58 +02:00
parent bfd833baf3
commit 3dd1bac4dc
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration/job/job_test.go
View File

@@ -66,6 +66,7 @@ import (
) )
const waitInterval = time.Second const waitInterval = time.Second
const fastPodFailureBackoff = 100 * time.Millisecond
type metricLabelsWithValue struct { type metricLabelsWithValue struct {
Labels []string Labels []string
@@ -467,6 +468,7 @@ func TestJobPodFailurePolicyWithFailedPodDeletedDuringControllerRestart(t *testi
// TestJobPodFailurePolicy tests handling of pod failures with respect to the // TestJobPodFailurePolicy tests handling of pod failures with respect to the
// configured pod failure policy rules // configured pod failure policy rules
func TestJobPodFailurePolicy(t *testing.T) { func TestJobPodFailurePolicy(t *testing.T) {
t.Cleanup(setDurationDuringTest(&jobcontroller.DefaultJobPodFailureBackOff, fastPodFailureBackoff))
job := batchv1.Job{ job := batchv1.Job{
Spec: batchv1.JobSpec{ Spec: batchv1.JobSpec{
Template: v1.PodTemplateSpec{ Template: v1.PodTemplateSpec{
@@ -689,6 +691,7 @@ func TestJobPodFailurePolicy(t *testing.T) {
// recreates the Job controller at some points to make sure a new controller // recreates the Job controller at some points to make sure a new controller
// is able to pickup. // is able to pickup.
func TestNonParallelJob(t *testing.T) { func TestNonParallelJob(t *testing.T) {
t.Cleanup(setDurationDuringTest(&jobcontroller.DefaultJobPodFailureBackOff, fastPodFailureBackoff))
closeFn, restConfig, clientSet, ns := setup(t, "simple") closeFn, restConfig, clientSet, ns := setup(t, "simple")
defer closeFn() defer closeFn()
ctx, cancel := startJobControllerAndWaitForCaches(restConfig) ctx, cancel := startJobControllerAndWaitForCaches(restConfig)
@@ -737,6 +740,7 @@ func TestNonParallelJob(t *testing.T) {
} }
func TestParallelJob(t *testing.T) { func TestParallelJob(t *testing.T) {
t.Cleanup(setDurationDuringTest(&jobcontroller.DefaultJobPodFailureBackOff, fastPodFailureBackoff))
cases := map[string]struct { cases := map[string]struct {
enableReadyPods bool enableReadyPods bool
}{ }{
@@ -893,6 +897,7 @@ func TestParallelJobWithCompletions(t *testing.T) {
// number of pods. // number of pods.
t.Cleanup(setDuringTest(&jobcontroller.MaxUncountedPods, 10)) t.Cleanup(setDuringTest(&jobcontroller.MaxUncountedPods, 10))
t.Cleanup(setDuringTest(&jobcontroller.MaxPodCreateDeletePerSync, 10)) t.Cleanup(setDuringTest(&jobcontroller.MaxPodCreateDeletePerSync, 10))
t.Cleanup(setDurationDuringTest(&jobcontroller.DefaultJobPodFailureBackOff, fastPodFailureBackoff))
cases := map[string]struct { cases := map[string]struct {
enableReadyPods bool enableReadyPods bool
}{ }{
@@ -977,6 +982,7 @@ func TestParallelJobWithCompletions(t *testing.T) {
} }
func TestIndexedJob(t *testing.T) { func TestIndexedJob(t *testing.T) {
t.Cleanup(setDurationDuringTest(&jobcontroller.DefaultJobPodFailureBackOff, fastPodFailureBackoff))
closeFn, restConfig, clientSet, ns := setup(t, "indexed") closeFn, restConfig, clientSet, ns := setup(t, "indexed")
defer closeFn() defer closeFn()
ctx, cancel := startJobControllerAndWaitForCaches(restConfig) ctx, cancel := startJobControllerAndWaitForCaches(restConfig)
@@ -1378,11 +1384,7 @@ func TestFinalizersClearedWhenBackoffLimitExceeded(t *testing.T) {
} }
func TestJobPodsCreatedWithExponentialBackoff(t *testing.T) { func TestJobPodsCreatedWithExponentialBackoff(t *testing.T) {
// overwrite the default value for faster testing t.Cleanup(setDurationDuringTest(&jobcontroller.DefaultJobPodFailureBackOff, 2*time.Second))
oldBackoff := jobcontroller.DefaultJobPodFailureBackOff
defer func() { jobcontroller.DefaultJobPodFailureBackOff = oldBackoff }()
jobcontroller.DefaultJobPodFailureBackOff = 2 * time.Second
closeFn, restConfig, clientSet, ns := setup(t, "simple") closeFn, restConfig, clientSet, ns := setup(t, "simple")
defer closeFn() defer closeFn()
ctx, cancel := startJobControllerAndWaitForCaches(restConfig) ctx, cancel := startJobControllerAndWaitForCaches(restConfig)
@@ -2141,6 +2143,14 @@ func setDuringTest(val *int, newVal int) func() {
} }
} }
func setDurationDuringTest(val *time.Duration, newVal time.Duration) func() {
origVal := *val
*val = newVal
return func() {
*val = origVal
}
}
func updateJob(ctx context.Context, jobClient typedv1.JobInterface, jobName string, updateFunc func(*batchv1.Job)) (*batchv1.Job, error) { func updateJob(ctx context.Context, jobClient typedv1.JobInterface, jobName string, updateFunc func(*batchv1.Job)) (*batchv1.Job, error) {
var job *batchv1.Job var job *batchv1.Job
err := retry.RetryOnConflict(retry.DefaultBackoff, func() error { err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {