Skip to content

Rescan disks before resize operations on Windows #2881

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

Open
torredil wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −1
Open

Rescan disks before resize operations on Windows #2881

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 15 additions & 1 deletion pkg/mounter/mount_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ package mounter
import (
"errors"
"fmt"
"regexp"

"github.com/kubernetes-sigs/aws-ebs-csi-driver/pkg/util"
"golang.org/x/sys/windows"
"regexp"

"k8s.io/klog/v2"
mountutils "k8s.io/mount-utils"
Expand Down Expand Up @@ -200,8 +201,15 @@ func (m *NodeMounter) PathExists(path string) (bool, error) {
func (m *NodeMounter) Resize(devicePath, deviceMountPath string) (bool, error) {
switch proxyMounter := m.SafeFormatAndMount.Interface.(type) {
case *CSIProxyMounterV2:
// Refresh the host storage cache before resizing to ensure Windows has an updated view of disk geometry.
if err := proxyMounter.Rescan(); err != nil {
klog.ErrorS(err, "Rescan failed during Resize")
}
return proxyMounter.ResizeVolume(deviceMountPath)
case *CSIProxyMounter:
if err := proxyMounter.Rescan(); err != nil {
klog.ErrorS(err, "Rescan failed during Resize")
}
return proxyMounter.ResizeVolume(deviceMountPath)
default:
return false, ErrUnsupportedMounter
Expand All @@ -215,6 +223,9 @@ func (m *NodeMounter) NeedResize(devicePath, deviceMountPath string) (bool, erro

switch proxyMounter := m.SafeFormatAndMount.Interface.(type) {
case *CSIProxyMounterV2:
if err := proxyMounter.Rescan(); err != nil {
klog.ErrorS(err, "Rescan failed during NeedResize")
}
deviceSize, err = proxyMounter.GetDeviceSize(devicePath)
if err != nil {
return false, fmt.Errorf("failed to get device size: %w", err)
Expand All @@ -224,6 +235,9 @@ func (m *NodeMounter) NeedResize(devicePath, deviceMountPath string) (bool, erro
return false, fmt.Errorf("failed to get filesystem size: %w", err)
}
case *CSIProxyMounter:
if err := proxyMounter.Rescan(); err != nil {
klog.ErrorS(err, "Rescan failed during NeedResize")
}
deviceSize, err = proxyMounter.GetDeviceSize(devicePath)
if err != nil {
return false, fmt.Errorf("failed to get device size: %w", err)
Expand Down