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

Avoid conflicts in updateSnapshotContentStatus #1066

Merged

Conversation

leonardoce
Copy link
Contributor

@leonardoce leonardoce commented Apr 16, 2024

This patch replace the usage of UpdateStatus with a patch against the status subresource in the updateSnapshotContentStatus.

The reason behind this change is to avoid conflicts that could potentially arise, as they pose a risk within the context of the calling function createGroupSnapshotWrapper.

If createGroupSnapshotWrapper is called multiple times for the same GroupSnapshot, this will lead to multiple stale VolumeSnapshot and VolumeSnapshotContent being created.

Related: #1050

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:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

Prevent VolumeSnapshotContent's update from erroring out because of conflicts in the CSI snapshotter sidecar.

@k8s-ci-robot k8s-ci-robot added do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. kind/bug Categorizes issue or PR as related to a bug. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. 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 Apr 16, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @leonardoce. Thanks for your PR.

I'm waiting for a kubernetes-csi 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.

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/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 16, 2024
@leonardoce leonardoce force-pushed the dev/potential-conflict-fix branch from 34c5bff to 3976cdb Compare April 16, 2024 07:54
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/invalid-commit-message Indicates that a PR should not merge because it has an invalid commit message. label Apr 16, 2024
Copy link
Member

@nixpanic nixpanic left a comment

Choose a reason for hiding this comment

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

/lgtm
/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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Apr 16, 2024
@nixpanic
Copy link
Member

/unassign
/assign xing-yang

@k8s-ci-robot k8s-ci-robot assigned xing-yang and unassigned nixpanic Apr 16, 2024
@xing-yang
Copy link
Collaborator

In the release note, can you specify that this change is in the CSI snapshotter sidecar.

This patch replace the usage of `UpdateStatus` with a patch against the
`status` subresource in the `updateSnapshotContentStatus`.

The reason behind this change is to avoid conflicts that could
potentially arise, as they pose a risk within the context of the calling
function `createGroupSnapshotWrapper`.

If `createGroupSnapshotWrapper` is called multiple times for the same
GroupSnapshot, this will lead to multiple stale `VolumeSnapshot` and
`VolumeSnapshotContent` being created.

Related to: kubernetes-csi#1050
@leonardoce leonardoce force-pushed the dev/potential-conflict-fix branch from 3976cdb to 456b8af Compare April 16, 2024 18:22
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 16, 2024
@leonardoce
Copy link
Contributor Author

In the release note, can you specify that this change is in the CSI snapshotter sidecar.

Done, and removed that stray line too. Thank you @xing-yang

@xing-yang
Copy link
Collaborator

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 16, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: leonardoce, xing-yang

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 Apr 16, 2024
@k8s-ci-robot k8s-ci-robot merged commit c18ccb3 into kubernetes-csi:master Apr 16, 2024
8 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants