Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not skip job requeue in conflict error #111026

Merged
merged 1 commit into from Jul 8, 2022

Conversation

alculquicondor
Copy link
Member

@alculquicondor alculquicondor commented Jul 8, 2022

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?

Fix bug where a job sync is not retried when there is a transient ResourceQuota conflict 

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/regression Categorizes issue or PR as related to a regression from a prior release. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 8, 2022
@alculquicondor
Copy link
Member Author

alculquicondor commented Jul 8, 2022

/priority critical-urgent
/triage accepted

@k8s-ci-robot k8s-ci-robot added priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 8, 2022
@k8s-ci-robot k8s-ci-robot requested review from kow3ns and soltysh Jul 8, 2022
@k8s-ci-robot k8s-ci-robot added sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 8, 2022
@alculquicondor alculquicondor force-pushed the job-conflicts branch 2 times, most recently from 57d362c to 58d19ab Compare Jul 8, 2022
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 8, 2022
@alculquicondor
Copy link
Member Author

alculquicondor commented Jul 8, 2022

/assign @janetkuo

@alculquicondor
Copy link
Member Author

alculquicondor commented Jul 8, 2022

/unassign janetkuo
/assign smarterclayton

@smarterclayton
Copy link
Contributor

smarterclayton commented Jul 8, 2022

/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)

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jul 8, 2022

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 8, 2022
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 8, 2022
@gautierdelorme
Copy link
Contributor

gautierdelorme commented Jul 8, 2022

Thanks for the quick revert @alculquicondor 👍 We'll need to backport the fix to 1.24 and 1.23 as well.

Change-Id: Ie97977887a1cc3de58922d73dce92ae1965965bf
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jul 8, 2022
@alculquicondor
Copy link
Member Author

alculquicondor commented Jul 8, 2022

/retest

@smarterclayton
Copy link
Contributor

smarterclayton commented Jul 8, 2022

/lgtm

thanks

@alculquicondor
Copy link
Member Author

alculquicondor commented Jul 8, 2022

Cherry-picks:
#111037
#111038

@k8s-ci-robot k8s-ci-robot merged commit eba254b into kubernetes:master Jul 8, 2022
14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone 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
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/regression Categorizes issue or PR as related to a regression from a prior release. lgtm Indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants