From 15b763d3fc1f893ebbcb548808f4fafdde7ab06f Mon Sep 17 00:00:00 2001
From: Jing Xu <jinxu@google.com>
Date: Thu, 18 Jun 2020 09:52:24 -0700
Subject: [PATCH] Revert "Merge pull request #166 from jingxu97/May/drivename"
This reverts commit 278ece378a5054f16a07622b51ddaf82b328d6e6, reversing
changes made to 2df71ebbae66f39338aed4cd0bb82d2212ee33cc.
---
mount/mount_windows.go | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/mount/mount_windows.go b/mount/mount_windows.go
index 62c967d6..f8b5ca32 100644
--- a/mount/mount_windows.go
+++ b/mount/mount_windows.go
@@ -26,6 +26,7 @@ import (
"strings"
"k8s.io/klog/v2"
+ utilexec "k8s.io/utils/exec"
"k8s.io/utils/keymutex"
)
@@ -221,38 +222,38 @@ func (mounter *SafeFormatAndMount) formatAndMountSensitive(source string, target
// format disk if it is unformatted(raw)
cmd := fmt.Sprintf("Get-Disk -Number %s | Where partitionstyle -eq 'raw' | Initialize-Disk -PartitionStyle MBR -PassThru"+
- " | New-Partition -UseMaximumSize | Format-Volume -FileSystem %s -Confirm:$false", source, fstype)
+ " | New-Partition -AssignDriveLetter -UseMaximumSize | Format-Volume -FileSystem %s -Confirm:$false", source, fstype)
if output, err := mounter.Exec.Command("powershell", "/c", cmd).CombinedOutput(); err != nil {
return fmt.Errorf("diskMount: format disk failed, error: %v, output: %q", err, string(output))
}
klog.V(4).Infof("diskMount: Disk successfully formatted, disk: %q, fstype: %q", source, fstype)
- volumeIds, err := listVolumesOnDisk(source)
+ driveLetter, err := getDriveLetterByDiskNumber(source, mounter.Exec)
if err != nil {
return err
}
- volumeID := volumeIds[0]
+ driverPath := driveLetter + ":"
target = NormalizeWindowsPath(target)
- output, err := mounter.Exec.Command("cmd", "/c", "mklink", "/D", target, volumeID).CombinedOutput()
+ output, err := mounter.Exec.Command("cmd", "/c", "mklink", "/D", target, driverPath).CombinedOutput()
if err != nil {
- klog.Errorf("mklink(%s, %s) failed: %v, output: %q", target, volumeID, err, string(output))
+ klog.Errorf("mklink(%s, %s) failed: %v, output: %q", target, driverPath, err, string(output))
return err
}
- klog.V(2).Infof("formatAndMount disk(%s) fstype(%s) on(%s) with output(%s) successfully", volumeID, fstype, target, string(output))
+ klog.V(2).Infof("formatAndMount disk(%s) fstype(%s) on(%s) with output(%s) successfully", driverPath, fstype, target, string(output))
return nil
}
-// ListVolumesOnDisk - returns back list of volumes(volumeIDs) in the disk (requested in diskID).
-func listVolumesOnDisk(diskID string) (volumeIDs []string, err error) {
- cmd := fmt.Sprintf("(Get-Disk -DeviceId %s | Get-Partition | Get-Volume).UniqueId", diskID)
+// Get drive letter according to windows disk number
+func getDriveLetterByDiskNumber(diskNum string, exec utilexec.Interface) (string, error) {
+ cmd := fmt.Sprintf("(Get-Partition -DiskNumber %s).DriveLetter", diskNum)
output, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
- klog.V(4).Infof("listVolumesOnDisk id from %s: %s", diskID, string(output))
if err != nil {
- return []string{}, fmt.Errorf("error list volumes on disk. cmd: %s, output: %s, error: %v", cmd, string(output), err)
+ return "", fmt.Errorf("azureMount: Get Drive Letter failed: %v, output: %q", err, string(output))
}
-
- volumeIds := strings.Split(strings.TrimSpace(string(output)), "\r\n")
- return volumeIds, nil
+ if len(string(output)) < 1 {
+ return "", fmt.Errorf("azureMount: Get Drive Letter failed, output is empty")
+ }
+ return string(output)[:1], nil
}
// getAllParentLinks walks all symbolic links and return all the parent targets recursively