Skip to content

Fix PVC finalizer update retrying on conflict#1339

Merged
k8s-ci-robot merged 1 commit intokubernetes-csi:masterfrom
akalenyu:conflict-err-lost-v2
Mar 12, 2026
Merged

Fix PVC finalizer update retrying on conflict#1339
k8s-ci-robot merged 1 commit intokubernetes-csi:masterfrom
akalenyu:conflict-err-lost-v2

Conversation

@akalenyu
Copy link
Contributor

@akalenyu akalenyu commented Oct 19, 2025

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change

/kind bug

/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

What this PR does / why we need it:
Today, this is never retried since we lose the conflict error characteristics once we return a new error type.

Which issue(s) this PR fixes:

Fixes #957

Special notes for your reviewer:
Revival of #1299

Does this PR introduce a user-facing change?:

Fix PVC finalizer update retrying on conflict

… removal

The `RetryOnConflict` function only retries the update of an object if the retured error is an unmodified 429 error. This commit fixes the retry to modify the error into a `controllerUpdateError` only after the `RetryOnConflict` function finishes.
@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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 19, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @akalenyu. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 19, 2025
@akalenyu
Copy link
Contributor Author

/cc @Fricounet

@k8s-ci-robot
Copy link
Contributor

@akalenyu: GitHub didn't allow me to request PR reviews from the following users: Fricounet.

Note that only kubernetes-csi members and repo collaborators can review this PR, and authors cannot review their own PRs.

Details

In response to this:

/cc @Fricounet

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Copy link
Contributor

@Fricounet Fricounet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good from my end. I don't have write access to the repository though so I can't really approve unfortunately

@akalenyu
Copy link
Contributor Author

Looks good from my end. I don't have write access to the repository though so I can't really approve unfortunately

That's fine
/cc @xing-yang

@sunnylovestiramisu
Copy link
Contributor

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 22, 2025
@akalenyu
Copy link
Contributor Author

/retest

@akalenyu
Copy link
Contributor Author

/cc @gnufied

@akalenyu
Copy link
Contributor Author

gentle ping 🙏 @xing-yang @gnufied

@nixpanic
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 12, 2026
@nixpanic
Copy link
Member

/unassign
/assign xing-yang

@k8s-ci-robot k8s-ci-robot assigned xing-yang and unassigned nixpanic Mar 12, 2026
@gnufied
Copy link
Contributor

gnufied commented Mar 12, 2026

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akalenyu, gnufied

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Mar 12, 2026
@k8s-ci-robot k8s-ci-robot merged commit 640434d into kubernetes-csi:master Mar 12, 2026
6 checks passed
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. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Common controller doesn't requeue on pvc finalizer remove err

7 participants