Skip to content

Fix volume expansion for larger sizes #2431

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

Merged
andyzhangx merged 2 commits into from
Mar 18, 2025
Merged

Fix volume expansion for larger sizes #2431

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdc09c1
Fix volume expansion for larger sizes
gnufied Mar 17, 2025
dd98f7f
fix: panic when fileShare.FileShareProperties.ShareQuota is nil
andyzhangx Mar 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions pkg/azurefile/azurefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import (
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"
mount "k8s.io/mount-utils"
"k8s.io/utils/ptr"

csicommon "sigs.k8s.io/azurefile-csi-driver/pkg/csi-common"
"sigs.k8s.io/azurefile-csi-driver/pkg/mounter"
Expand Down Expand Up @@ -1032,12 +1033,14 @@ func (d *Driver) ResizeFileShare(ctx context.Context, subsID, resourceGroup, acc
if err != nil {
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

fileShare.FileShareProperties.ShareQuota, sizeGiB, accountName, shareName)
return true, nil
}
fileShare.FileShareProperties.ShareQuota = to.Ptr(int32(sizeGiB))
_, err = fileClient.Update(ctx, resourceGroup, accountName, shareName, *fileShare)
if err != nil {
return true, err
}
return true, nil
return true, err
}
if isRetriableError(err) {
klog.Warningf("ResizeFileShare(%s) on account(%s) with new size(%d) failed with error(%v), waiting for retrying", shareName, accountName, sizeGiB, err)
Expand Down
Loading