github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

use /dev/disk/by-id instead of /dev/sd* for azure disk

Browse Source 
change uuid to id
This commit is contained in:
andyzhangx 2017-12-22 08:19:11 +00:00
parent 5001198f0e
commit 636a181d48
1 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/volume/azure_dd/azure_common_linux.go
View File

@ -19,6 +19,7 @@ limitations under the License.
package azure_dd package azure_dd
import ( import (
"fmt"
"path" "path"
"strconv" "strconv"
libstrings "strings" libstrings "strings"
@ -45,6 +46,27 @@ func listAzureDiskPath(io ioHandler) []string {
return azureDiskList return azureDiskList
} }
// getDiskIDByPath get disk id by device name from /dev/disk/by-id
func getDiskIDByPath(io ioHandler, devName string) (string, error) {
diskIDPath := "/dev/disk/by-id/"
dirs, err := io.ReadDir(diskIDPath)
if err == nil {
for _, f := range dirs {
diskPath := diskIDPath + f.Name()
link, linkErr := io.Readlink(diskPath)
if linkErr != nil {
glog.Warningf("azureDisk - read link (%s) error: %v", diskPath, linkErr)
continue
}
if libstrings.HasSuffix(link, devName) {
return diskPath, nil
}
}
return "", fmt.Errorf("device name(%s) is not found under %s", devName, diskIDPath)
}
return "", fmt.Errorf("read %s error: %v", diskIDPath, err)
}
func scsiHostRescan(io ioHandler, exec mount.Exec) { func scsiHostRescan(io ioHandler, exec mount.Exec) {
scsi_path := "/sys/class/scsi_host/" scsi_path := "/sys/class/scsi_host/"
if dirs, err := io.ReadDir(scsi_path); err == nil { if dirs, err := io.ReadDir(scsi_path); err == nil {
@ -129,15 +151,23 @@ func findDiskByLunWithConstraint(lun int, io ioHandler, azureDisks []string) (st
dir := path.Join(sys_path, name, "block") dir := path.Join(sys_path, name, "block")
if dev, err := io.ReadDir(dir); err == nil { if dev, err := io.ReadDir(dir); err == nil {
found := false found := false
devName := dev[0].Name()
for _, diskName := range azureDisks { for _, diskName := range azureDisks {
glog.V(12).Infof("azure disk - validating disk %q with sys disk %q", dev[0].Name(), diskName) glog.V(12).Infof("azureDisk - validating disk %q with sys disk %q", devName, diskName)
if string(dev[0].Name()) == diskName { if string(devName) == diskName {
found = true found = true
break break
} }
} }
if !found { if !found {
return "/dev/" + dev[0].Name(), nil diskPath, err := getDiskIDByPath(io, devName)
if err == nil {
glog.V(4).Infof("azureDisk - found %s by %s under /dev/disk/by-id", diskPath, devName)
return diskPath, nil
} else {
glog.Warningf("azureDisk - getDiskIDByPath by %s failed, error: %v", devName, err)
return "/dev/" + devName, nil
}
} }
} }
} }