Do not skip job requeue in conflict error #111026
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
k8s-ci-robot
added
release-note
|
/priority critical-urgent |
k8s-ci-robot
added
priority/critical-urgent
k8s-ci-robot
added
sig/apps
alculquicondor
force-pushed
the
job-conflicts
branch
2 times, most recently
from
57d362c
to
58d19ab
Compare
k8s-ci-robot
added
size/S
|
/assign @janetkuo |
|
/unassign janetkuo |
|
/approve Will tag on green, there was a second follow up question for the reporter about what they meant by "forever" that might indicate a second problem (resync didn't work / didn't happen / we kept conflicting for unknown reason) |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alculquicondor, smarterclayton The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
alculquicondor
force-pushed
the
job-conflicts
branch
from
58d19ab
to
97f63ae
Compare
k8s-ci-robot
added
size/XS
|
Thanks for the quick revert @alculquicondor 👍 We'll need to backport the fix to |
Change-Id: Ie97977887a1cc3de58922d73dce92ae1965965bf
alculquicondor
force-pushed
the
job-conflicts
branch
from
97f63ae
to
b492f49
Compare
k8s-ci-robot
added
size/S
|
/retest |
|
/lgtm thanks |
k8s-ci-robot
added
the
lgtm
This was referenced Jul 8, 2022
k8s-ci-robot
added a commit
that referenced
this pull request
Jul 12, 2022
…of-#111026-upstream-release-1.24 Automated cherry pick of #111026: Do not skip job requeue in conflict error
k8s-ci-robot
added a commit
that referenced
this pull request
Jul 12, 2022
…of-#111026-upstream-release-1.23 Automated cherry pick of #111026: Do not skip job requeue in conflict error
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
/kind regression
What this PR does / why we need it:
This reverts a minor optimization where we skipped job requeue on conflict.
The conflict could happen in a ResourceQuota object, which wouldn't cause the job to be requeued through other means.
Which issue(s) this PR fixes:
Ref https://github.com/kubernetes/kubernetes/pull/105214/files#r916299519
Special notes for your reviewer:
Does this PR introduce a user-facing change?
Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.: