upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-13 10:50:56 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not skip job requeue in conflict error

Browse source 
Change-Id: Ie97977887a1cc3de58922d73dce92ae1965965bf
This commit is contained in:
Aldo Culquicondor 2022-07-08 14:39:59 +00:00
parent 01f80aefeb
commit 71a4c69a21
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkg/controller/job/job_controller.go
View file

@ -531,12 +531,7 @@ func (jm *Controller) processNextWorkItem(ctx context.Context) bool {
}
utilruntime.HandleError(fmt.Errorf("syncing job: %w", err))
if !apierrors.IsConflict(err) {
// If this was a conflict error, we expect a Job or Pod update event, which
// will add the job back to the queue. Avoiding the rate limited requeue
// saves an unnecessary sync.
jm.queue.AddRateLimited(key)
}
jm.queue.AddRateLimited(key)
return true
}

4
pkg/controller/job/job_controller_test.go
View file

@ -1997,11 +1997,13 @@ func TestSyncJobUpdateRequeue(t *testing.T) {
wantRequeue: true,
},
"conflict error": {
updateErr: apierrors.NewConflict(schema.GroupResource{}, "", nil),
updateErr: apierrors.NewConflict(schema.GroupResource{}, "", nil),
wantRequeue: true,
},
"conflict error, with finalizers": {
withFinalizers: true,
updateErr: apierrors.NewConflict(schema.GroupResource{}, "", nil),
wantRequeue: true,
},
}
for name, tc := range cases {