Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Automated cherry pick of #94599: Fixes Attach Detach Controller reconciler race reading #96617: Recover CSI volumes from dangling attachments #98223

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
Merged
merged 4 commits into from
Feb 4, 2021
Merged

Automated cherry pick of #94599: Fixes Attach Detach Controller reconciler race reading #96617: Recover CSI volumes from dangling attachments #98223

merged 4 commits into from
Feb 4, 2021

Conversation

vpnachev
Copy link
Contributor

@vpnachev vpnachev commented Jan 20, 2021 •
edited
Loading

Cherry pick of #94599 #96617 on release-1.18.

#94599: Fixes Attach Detach Controller reconciler race reading
#96617: Recover CSI volumes from dangling attachments

For details on the cherry pick process, see the cherry pick requests page.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Jan 20, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Jan 20, 2021
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jan 20, 2021
@k8s-ci-robot
Copy link
Contributor

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

@k8s-ci-robot k8s-ci-robot added needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 20, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @vpnachev. Thanks for your PR.

I'm waiting for a kubernetes 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 needs-priority Indicates a PR lacks a `priority/foo` label and requires one. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 20, 2021
@vpnachev
Copy link
Contributor Author

/sig storage
/kind bug
/cc @msau42 @gnufied

@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. kind/bug Categorizes issue or PR as related to a bug. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. labels Jan 20, 2021
@k8s-ci-robot k8s-ci-robot requested a review from jingxu97 January 20, 2021 13:23
@k8s-ci-robot k8s-ci-robot added the sig/apps Categorizes an issue or PR as relevant to SIG Apps. label Jan 20, 2021
@gnufied
Copy link
Member

gnufied commented Jan 20, 2021

/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 Jan 20, 2021
@gnufied
Copy link
Member

gnufied commented Jan 20, 2021

@vpnachev looks like you have to tweak the PR for cherry-pick. it is failing.

verult and others added 4 commits January 30, 2021 22:36
@verult @vpnachev
Fixes Attach Detach Controller reconciler race reading ActualStateOfW…
4db5b34 
…orld and operation pending states; fixes reconciler_test mock detach to account for multiple attaches on a node
@verult @vpnachev
IsVolumeAttachedToNode() renamed to GetAttachState(), and returns 3 s…
200c9b1 
…tates instead of combining "uncertain" and "detached" into "false"
@yuga711 @vpnachev
Recover CSI volumes from dangling attachments
66cc4bb 
Change-Id: I72105d67d8a4069ab19bfa4638a7ac365cf4194c
@vpnachev
Fix build after cherry-picking
d4cc37c
@vpnachev vpnachev force-pushed the automated-cherry-pick-of-#96617-upstream-release-1.19 branch from b19f811 to d4cc37c Compare January 30, 2021 20:58
@vpnachev
Copy link
Contributor Author

/retest

@vpnachev
Copy link
Contributor Author

I have cherry-picked also the commits from #94599 as #96617 is based on the changes in that PR.
Please, let me know if I have to change something to the PR description to reflect that one more pr is cherry-picked.

@vpnachev
Copy link
Contributor Author

/assign @saad-ali

@vpnachev
Copy link
Contributor Author

/test pull-kubernetes-e2e-gce-100-performance
/test pull-kubernetes-e2e-gce-ubuntu-containerd

@vpnachev vpnachev changed the title Automated cherry pick of #96617: Recover CSI volumes from dangling attachments Automated cherry pick of #94599: Fixes Attach Detach Controller reconciler race reading #96617: Recover CSI volumes from dangling attachments Jan 31, 2021
@k8s-ci-robot k8s-ci-robot added the do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. label Jan 31, 2021
@vpnachev
Copy link
Contributor Author

Please, let me know if I have to change something to the PR description to reflect that one more pr is cherry-picked.

I have updated the title and the description of the PR to reflect the additionally cherry picked PR

@vpnachev
Copy link
Contributor Author

/release-note-none

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed 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 Jan 31, 2021
@vpnachev
Copy link
Contributor Author

vpnachev commented Feb 2, 2021

@vpnachev looks like you have to tweak the PR for cherry-pick. it is failing.

@gnufied the build is fixed. Please, take another look.

@gnufied
Copy link
Member

gnufied commented Feb 2, 2021

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 2, 2021
@msau42
Copy link
Member

msau42 commented Feb 2, 2021

/approve

I do think we need to have release-notes from the original issues. @kubernetes/release-managers does this automatically get picked up?

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: msau42, vpnachev

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 Feb 2, 2021
@vpnachev
Copy link
Contributor Author

vpnachev commented Feb 2, 2021

I am open to update the PR with release note, but I need some guidance how to do it now.

According to the this and this guides, it should be fetched automatically from the cherry picked PRs, but the bot added do-not-merge/release-note-label-needed after I have cherry-picked #94599 which either way has no release note.

So am I suppose to copy the release note from #96617 or I should interact somehow with the bot?

@feiskyer feiskyer added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Feb 4, 2021
@vpnachev
Copy link
Contributor Author

vpnachev commented Feb 4, 2021

/test pull-kubernetes-e2e-gce-ubuntu-containerd
/test pull-kubernetes-e2e-gce-ubuntu-containerd

@vpnachev
Copy link
Contributor Author

vpnachev commented Feb 4, 2021

/test pull-kubernetes-node-e2e

@k8s-ci-robot k8s-ci-robot merged commit 4b810be into kubernetes:release-1.19 Feb 4, 2021
@vpnachev vpnachev deleted the automated-cherry-pick-of-#96617-upstream-release-1.19 branch February 10, 2021 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gnufied gnufied Awaiting requested review from gnufied

@msau42 msau42 Awaiting requested review from msau42

@jingxu97 jingxu97 Awaiting requested review from jingxu97

Assignees

@gnufied gnufied

@saad-ali saad-ali

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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. 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/storage Categorizes an issue or PR as relevant to SIG Storage. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.
8 participants
@vpnachev @k8s-ci-robot @gnufied @msau42 @feiskyer @saad-ali @verult @yuga711