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.

Sign up for GitHub

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

Jump to bottom

Delete volumeattachment with resourceVersion in pv Detach operation #124919

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Delete volumeattachment with resourceVersion in pv Detach operation #124919

wants to merge 1 commit into from
+29 −9

Conversation

pandaamanda
Copy link
Contributor

@pandaamanda pandaamanda commented May 17, 2024 •
edited

What type of PR is this?

/kind bug

What this PR does / why we need it:

When va finalizers patch operation and va deletion operation are performed at the same time, deletion with resourceVersion can avoid accidental deletion of va when finalizers patch operation is successful.

Which issue(s) this PR fixes:

Fixes #124749

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Volumeattachment deletion in the csi detach will pass resourceVersion to deleteOptions.

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

None

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. 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. labels May 17, 2024
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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 needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label May 17, 2024
@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels May 17, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: pandaamanda
Once this PR has been reviewed and has the lgtm label, please assign msau42 for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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 release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels May 17, 2024
@pandaamanda
Delete volumeattachment with resourceVersion in pv Detach operation
25bd3b0 
Delete volumeattachment with resourceVersion in pv Detach operation
@pandaamanda pandaamanda force-pushed the va_delete_carry_resourceversion branch from 2918f0a to 25bd3b0 Compare May 17, 2024 06:47
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 17, 2024
@pandaamanda
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-storage-snapshot

1 similar comment
@pandaamanda
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-storage-snapshot

mattcary
mattcary reviewed May 17, 2024
View reviewed changes
pkg/volume/csi/csi_attacher_test.go
@@ -928,17 +928,19 @@ func TestAttacherVolumesAreAttachedWithInline(t *testing.T) {

func TestAttacherDetach(t *testing.T) {
nodeName := "fakeNode"
resyncPeriod := 10 * time.Second
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you comment what this change to the resyncPeriod does? I don't quite see how this exercises your change (if indeed it's possible to at all)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

c.plugin.volumeAttachmentLister.Get(attachID) can not get va from informer before this change, after sleep CsiResyncPeriod(1 min), it can get va from informer. so i reduce the sleep time from 1 min to 10s.

i don't know why can not get va from informer after we create the va in the test.

@mattcary
Copy link
Contributor

Thanks for finding & fixing this race condition!

@pandaamanda pandaamanda requested a review from mattcary May 27, 2024 01:08
jsafrane
jsafrane reviewed May 31, 2024
View reviewed changes
pkg/volume/csi/csi_attacher_test.go
@@ -978,6 +981,7 @@ func TestAttacherDetach(t *testing.T) {
if err != nil {
t.Fatalf("failed to attach: %v", err)
}
time.Sleep(tc.resyncPeriod)
Copy link
Member

Choose a reason for hiding this comment

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

I would prefer some WaitForAttachment() that would wait until the informer gets VolumeAttachment with the right state + timeout error when it's not attached in X minutes. 10s is very fragile.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jsafrane jsafrane jsafrane left review comments

@jingxu97 jingxu97 Awaiting requested review from jingxu97

@mattcary mattcary Awaiting requested review from mattcary

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Volumeattachment deletion in a detach operation should carry the resourceVersion
4 participants
@pandaamanda @k8s-ci-robot @mattcary @jsafrane