Skip to content

[manila-csi-plugin] ControllerExpandVolume: fix bad key for deleting from pendingVolumes (release-1.22)#1675

Merged
k8s-ci-robot merged 1 commit intokubernetes:release-1.22from
gman0:backport-1667-release-1.22
Nov 2, 2021
Merged

[manila-csi-plugin] ControllerExpandVolume: fix bad key for deleting from pendingVolumes (release-1.22)#1675
k8s-ci-robot merged 1 commit intokubernetes:release-1.22from
gman0:backport-1667-release-1.22

Conversation

@gman0
Copy link
Copy Markdown
Contributor

@gman0 gman0 commented Oct 26, 2021

This is a backport of #1667 into the release-1.22 branch.

Cherry-picked from 4128209.

What this PR does / why we need it:

Without this fix, ControllerExpandVolume breaks locks on the affected volume. Controller plugin would need a manual restart (pod deletion).

Which issue this PR fixes(if applicable):
fixes #

Special notes for reviewers:

Release note:

[manila-csi-plugin] Fixed locking in ControllerExpandVolume

…from pendingVolumes (kubernetes#1667)

* [manila-csi-plugin] in ControllerExpandVolume fix bad key for pendingVolumes.Delete

/closes kubernetes#1666

* [manila-csi-plugin] use share.Name to identify volumes in pendingVolumes.Delete
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 26, 2021
@gman0
Copy link
Copy Markdown
Contributor Author

gman0 commented Oct 26, 2021

PTAL @ramineni @lingxiankong @gouthampacha

@lingxiankong could you please also cut a new image for this?

@gman0
Copy link
Copy Markdown
Contributor Author

gman0 commented Oct 26, 2021

/cc @alexisries

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

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

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

Details

In response to this:

/cc @alexisries

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.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Oct 26, 2021

Build failed.

@gman0
Copy link
Copy Markdown
Contributor Author

gman0 commented Oct 26, 2021

Please note that the CI is expected to fail. openlab/cloud-provider-openstack-acceptance-test-csi-manila doesn't exist anymore (I need to remove triggers for it), and the new e2e job hasn't been merged yet.

Copy link
Copy Markdown
Contributor

@gouthampacha gouthampacha left a comment

Choose a reason for hiding this comment

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

/lgtm

@gouthampacha
Copy link
Copy Markdown
Contributor

Thanks for backporting this fix, @gman0

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 26, 2021
@ramineni
Copy link
Copy Markdown
Contributor

ramineni commented Nov 2, 2021

@gman0 would you like to add manila jobs for 1.22 as well?

@ramineni
Copy link
Copy Markdown
Contributor

ramineni commented Nov 2, 2021

Only cherrypick . Not a big change , so merging this.

/approve

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ramineni

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 Nov 2, 2021
@gman0
Copy link
Copy Markdown
Contributor Author

gman0 commented Nov 2, 2021

@ramineni I think it's not necessary, there are no other backports planned. Unless some important bugfix occurs, like this one.

The merge is blocked by openlab/cloud-provider-openstack-acceptance-test-csi-manila, can you please override?

@ramineni
Copy link
Copy Markdown
Contributor

ramineni commented Nov 2, 2021

/override openlab/cloud-provider-openstack-acceptance-test-csi-manila

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

@ramineni: Overrode contexts on behalf of ramineni: openlab/cloud-provider-openstack-acceptance-test-csi-manila

Details

In response to this:

/override openlab/cloud-provider-openstack-acceptance-test-csi-manila

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 merged commit 4f6a931 into kubernetes:release-1.22 Nov 2, 2021
@gman0
Copy link
Copy Markdown
Contributor Author

gman0 commented Nov 2, 2021

@lingxiankong this is merged. Could you please push updated image to https://hub.docker.com/r/k8scloudprovider/manila-csi-plugin ? Ref issue #1666

@lingxiankong
Copy link
Copy Markdown
Contributor

@lingxiankong this is merged. Could you please push updated image to https://hub.docker.com/r/k8scloudprovider/manila-csi-plugin ? Ref issue #1666

Hi @gman0 sure, no problem. Sorry for the late response, distracted by internal stuff. Will push a new image for manila-csi-plugin on stable v1.22 today.

@lingxiankong
Copy link
Copy Markdown
Contributor

@gman0
Copy link
Copy Markdown
Contributor Author

gman0 commented Nov 9, 2021

@lingxiankong thank you!

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. 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. 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.

6 participants