github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111026 from alculquicondor/job-conflicts

Browse Source 
Do not skip job requeue in conflict error
This commit is contained in:
Kubernetes Prow Robot 2022-07-08 13:23:46 -07:00 committed by GitHub
commit eba254b4ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -537,12 +537,7 @@ func (jm *Controller) processNextWorkItem(ctx context.Context) bool {
} }
utilruntime.HandleError(fmt.Errorf("syncing job: %w", err)) utilruntime.HandleError(fmt.Errorf("syncing job: %w", err))
if !apierrors.IsConflict(err) { jm.queue.AddRateLimited(key)
// 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)
}
return true return true
} }

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

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