Skip to content
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

[release-1.29] fix: resize failure when cloning a volume with bigger size on Windows #2505

Merged
merged 1 commit into from
Sep 11, 2024
Merged

[release-1.29] fix: resize failure when cloning a volume with bigger size on Windows #2505

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
26 changes: 24 additions & 2 deletions pkg/mounter/safe_mounter_host_process_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,30 @@ func (mounter *winMounter) GetVolumeSizeInBytes(volumePath string) (int64, error
}

// ResizeVolume resizes the volume to the maximum available size.
func (mounter *winMounter) ResizeVolume(devicePath string) error {
return volume.ResizeVolume(devicePath, 0)
// source could be the disk number or the volume id.
func (mounter *winMounter) ResizeVolume(source string) error {
var volumeID string

diskNum, err := strconv.Atoi(source)
if err == nil {
// List the volumes on the given disk.
volumeIds, err := volume.ListVolumesOnDisk(uint32(diskNum), 0)
if err != nil {
return err
}
if len(volumeIds) == 0 {
return fmt.Errorf("no volumes found on disk %d", diskNum)
}

// TODO: consider partitions and choose the right partition.
// For now just choose the first volume.
volumeID = volumeIds[0]
} else {
klog.V(2).Infof("parse %s failed with error: %v", source, err)
volumeID = source
}

return volume.ResizeVolume(volumeID, 0)
}

// GetFreeSpace returns the free space of the volume in bytes, total size of the volume in bytes and the used space of the volume in bytes
Expand Down
Loading