add multipath device support

api/v1alpha1/localvolumediscovery_types.go

@@ -43,6 +43,8 @@ const (
 	PartType DiscoveredDeviceType = "part"
 	// LVMType is an LVM type
 	LVMType DiscoveredDeviceType = "lvm"
+	// MultiPathType is a multipath type
+	MultiPathType DiscoveredDeviceType = "mpath"
 )
 
 // LocalVolumeDiscoverySpec defines the desired state of LocalVolumeDiscovery

diskmaker/discovery/discovery.go

@@ -179,8 +179,12 @@ func getDiscoverdDevices(blockDevices []internal.BlockDevice) []v1alpha1.Discove
 			klog.Warningf("failed to parse size for the device %q. Error %v", blockDevice.Name, err)
 		}
 
+		path, err := blockDevice.GetDevPath()
+		if err != nil {
+			klog.Warningf("failed to parse path for the device %q. Error %v", blockDevice.KName, err)
+		}
 		discoveredDevice := v1alpha1.DiscoveredDevice{
-			Path:     fmt.Sprintf("/dev/%s", blockDevice.Name),
+			Path:     path,
 			Model:    blockDevice.Model,
 			Vendor:   blockDevice.Vendor,
 			FSType:   blockDevice.FSType,
@@ -308,6 +312,8 @@ func parseDeviceType(deviceType string) v1alpha1.DiscoveredDeviceType {
 		return v1alpha1.PartType
 	case deviceType == "lvm":
 		return v1alpha1.LVMType
+	case deviceType == "mpath":
+		return v1alpha1.MultiPathType
 	}
 
 	return ""

diskmaker/discovery/discovery_test.go

@@ -467,7 +467,7 @@ func TestGetDiscoveredDevices(t *testing.T) {
 				{
 					Name:       "sda",
 					KName:      "dm-0",
-					FSType:     "xfs",
+					FSType:     "",
 					Type:       "mpath",
 					Size:       "62913494528",
 					Model:      "",
@@ -494,7 +494,7 @@ func TestGetDiscoveredDevices(t *testing.T) {
 					Serial:   "",
 					Size:     int64(62913494528),
 					Property: "NonRotational",
-					FSType:   "xfs",
+					FSType:   "",
 					Status:   v1alpha1.DeviceStatus{State: v1alpha1.NotAvailable},
 				},
 			},

internal/diskutil.go

@@ -27,6 +27,8 @@ const (
 	StateSuspended = "suspended"
 	// DiskByIDDir is the path for symlinks to the device by id.
 	DiskByIDDir = "/dev/disk/by-id/"
+	// DiskDMDir is the path for symlinks of device mapper disks (e.g. mpath)
+	DiskDMDir = "/dev/mapper/"
 )
 
 // IDPathNotFoundError indicates that a symlink to the device was not found in /dev/disk/by-id/
@@ -146,11 +148,15 @@ func (b BlockDevice) HasBindMounts() (bool, string, error) {
 }
 
 // GetDevPath for block device (/dev/sdx)
-func (b BlockDevice) GetDevPath() (string, error) {
+func (b BlockDevice) GetDevPath() (path string, err error) {
 	if b.KName == "" {
-		return "", fmt.Errorf("empty KNAME")
+		path = ""
+		err = fmt.Errorf("empty KNAME")
 	}
-	return filepath.Join("/dev/", b.KName), nil
+
+	path = filepath.Join("/dev/", b.KName)
+
+	return
 }
 
 // GetPathByID check on BlockDevice