Skip to content

Fix volume expansion for larger sizes#2431

Merged
andyzhangx merged 2 commits intokubernetes-sigs:masterfrom
gnufied:fix-volume-expansion-tests-nfs
Mar 18, 2025
Merged

Fix volume expansion for larger sizes#2431
andyzhangx merged 2 commits intokubernetes-sigs:masterfrom
gnufied:fix-volume-expansion-tests-nfs

Conversation

@gnufied
Copy link
Copy Markdown
Contributor

@gnufied gnufied commented Mar 17, 2025

Fixes #2423

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 17, 2025
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

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

The full list of commands accepted by this bot can be found 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 requested review from ZeroMagic and cvvz March 17, 2025 20:44
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Mar 17, 2025
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 18, 2025
@andyzhangx
Copy link
Copy Markdown
Member

andyzhangx commented Mar 18, 2025

/retest

3 similar comments
@andyzhangx
Copy link
Copy Markdown
Member

andyzhangx commented Mar 18, 2025

/retest

@andyzhangx
Copy link
Copy Markdown
Member

andyzhangx commented Mar 18, 2025

/retest

@andyzhangx
Copy link
Copy Markdown
Member

andyzhangx commented Mar 18, 2025

/retest

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Mar 18, 2025 •
edited
Loading

@gnufied: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-azurefile-csi-driver-e2e-capz dd98f7f link true /test pull-azurefile-csi-driver-e2e-capz

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@andyzhangx andyzhangx merged commit 1819468 into kubernetes-sigs:master Mar 18, 2025
21 of 23 checks passed
@andyzhangx
Copy link
Copy Markdown
Member

andyzhangx commented Mar 18, 2025

/cherrypick release-1.32

@andyzhangx
Copy link
Copy Markdown
Member

andyzhangx commented Mar 18, 2025

/cherrypick release-1.31

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Mar 18, 2025
Merged
@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Mar 18, 2025

@andyzhangx: new pull request created: #2432

Details

In response to this:

/cherrypick release-1.32

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-infra-cherrypick-robot
Copy link
Copy Markdown

k8s-infra-cherrypick-robot commented Mar 18, 2025

@andyzhangx: #2431 failed to apply on top of branch "release-1.31":

Applying: Fix volume expansion for larger sizes
Using index info to reconstruct a base tree...
M	pkg/azurefile/azurefile.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/azurefile.go
CONFLICT (content): Merge conflict in pkg/azurefile/azurefile.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fix volume expansion for larger sizes
Details

In response to this:

/cherrypick release-1.31

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.

gnufied
gnufied commented Mar 18, 2025
View reviewed changes
pkg/azurefile/azurefile.go
return true, err
}
if ptr.Deref(fileShare.FileShareProperties.ShareQuota, 0) >= int32(sizeGiB) {
klog.Warningf("file share size(%dGi) is already greater or equal than requested size(%dGi), accountName: %s, shareName: %s",
Copy link
Copy Markdown
Contributor Author

@gnufied gnufied Mar 18, 2025

Choose a reason for hiding this comment

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

so, if fileShare.FileShareProperties.ShareQuota was nil, then IMO the logging statement below should have also guarded against printing nil pointer. But that is perhaps a minor nit. :/

Copy link
Copy Markdown
Member

@andyzhangx andyzhangx Mar 19, 2025

Choose a reason for hiding this comment

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

#2433 would fix the issue, thx

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

Reviewers

@andyzhangx andyzhangx andyzhangx left review comments

@cvvz cvvz Awaiting requested review from cvvz

@ZeroMagic ZeroMagic Awaiting requested review from ZeroMagic

Assignees

No one assigned

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Resizing related tests broken with latest version

4 participants

@gnufied @k8s-ci-robot @andyzhangx @k8s-infra-cherrypick-robot