Add support for removable devices and minor refactor (#614)

Author: Praveenrajmani

pkg/node/uevent_test.go

@@ -635,7 +635,7 @@ func TestUpdateHandler(t *testing.T) {
 				PTUUID:            "7e3bf265-0396-440b-88fd-dc2003505583",
 				PTType:            "gpt",
 				PartUUID:          "d895e5a6-c5cb-49d7-ae0d-a3946f4f1a3a",
-				FSUUID:            "e79dff9e-2884-46f2-8919-dada2eecb12d",
+				FSUUID:            "d79dff9e-2884-46f2-8919-dada2eecb12d",
 				FSType:            "xfs",
 				UeventSerial:      "12345ABCD678",
 				UeventFSUUID:      "e79dff9e-2884-46f2-8919-dada2eecb12d",

pkg/node/uevent_utils.go

@@ -53,8 +53,6 @@ func (d *driveEventHandler) setDriveStatus(device *sys.Device, drive *directcsi.
 	updatedDrive := drive.DeepCopy()
 	updatedDrive.Status.NodeName = d.nodeID
 	updatedDrive.Status.Topology = d.topology
-	updatedDrive.Status.Filesystem = device.FSType
-	updatedDrive.Status.FilesystemUUID = device.FSUUID
 	updatedDrive.Status.UeventFSUUID = device.UeventFSUUID
 	updatedDrive.Status.MajorNumber = uint32(device.Major)
 	updatedDrive.Status.MinorNumber = uint32(device.Minor)
@@ -72,6 +70,14 @@ func (d *driveEventHandler) setDriveStatus(device *sys.Device, drive *directcsi.
 	updatedDrive.Status.Partitioned = device.Partitioned
 	updatedDrive.Status.PCIPath = device.PCIPath
 
+	// do not update FS info for managed drives
+	if updatedDrive.Status.Filesystem == "" || !utils.IsManagedDrive(updatedDrive) {
+		updatedDrive.Status.Filesystem = device.FSType
+	}
+	if updatedDrive.Status.FilesystemUUID == "" || !utils.IsManagedDrive(updatedDrive) {
+		updatedDrive.Status.FilesystemUUID = device.FSUUID
+	}
+
 	// populate mount infos
 	updatedDrive.Status.MountOptions = device.FirstMountOptions
 	updatedDrive.Status.Mountpoint = device.FirstMountPoint
@@ -93,6 +99,10 @@ func (d *driveEventHandler) setDriveStatus(device *sys.Device, drive *directcsi.
 		if strings.EqualFold(updatedDrive.Status.PartitionUUID, device.PartUUID) {
 			updatedDrive.Status.PartitionUUID = device.PartUUID
 		}
+		// bugfix: for versions < 3.0.0, the partitionUUID has to be unset or set to empty for root partitions
+		if device.Partition == int(0) {
+			updatedDrive.Status.PartitionUUID = device.PartUUID
+		}
 	}
 
 	if updatedDrive.Status.DMUUID == "" || !utils.IsManagedDrive(updatedDrive) {
@@ -149,22 +159,27 @@ func validateDrive(drive *directcsi.DirectCSIDrive, device *sys.Device) error {
 	var err error
 	switch drive.Status.DriveStatus {
 	case directcsi.DriveStatusInUse, directcsi.DriveStatusReady:
-		if !mount.ValidDirectPVMounts(device.MountPoints) {
+		// Check if the drive is umounted or if the directpv mount is not found
+		if device.FirstMountPoint == "" || !mount.ValidDirectPVMounts(device.MountPoints) {
 			err = multierr.Append(err, errInvalidMount)
 		}
-		if device.FirstMountPoint != filepath.Join(sys.MountRoot, drive.Name) &&
-			device.FirstMountPoint != filepath.Join(sys.MountRoot, drive.Status.FilesystemUUID) {
-			err = multierr.Append(err, errInvalidDrive(
-				"Mountpoint",
-				filepath.Join(sys.MountRoot, drive.Name),
-				device.FirstMountPoint))
-		}
-		if !mount.ValidDirectPVMountOpts(device.FirstMountOptions) {
-			err = multierr.Append(err, errInvalidDrive(
-				"MountpointOptions",
-				mount.MountOptRW,
-				device.FirstMountOptions))
+		// Verify drive mount and mountopts
+		if device.FirstMountPoint != "" {
+			if device.FirstMountPoint != filepath.Join(sys.MountRoot, drive.Name) &&
+				device.FirstMountPoint != filepath.Join(sys.MountRoot, drive.Status.FilesystemUUID) {
+				err = multierr.Append(err, errInvalidDrive(
+					"Mountpoint",
+					filepath.Join(sys.MountRoot, drive.Name),
+					device.FirstMountPoint))
+			}
+			if !mount.ValidDirectPVMountOpts(device.FirstMountOptions) {
+				err = multierr.Append(err, errInvalidDrive(
+					"MountpointOptions",
+					mount.MountOptRW,
+					device.FirstMountOptions))
+			}
 		}
+		// Check other device attributes
 		if device.Size < sys.MinSupportedDeviceSize {
 			err = multierr.Append(err, fmt.Errorf(
 				"the size of the drive is less than %v",
@@ -182,12 +197,6 @@ func validateDrive(drive *directcsi.DirectCSIDrive, device *sys.Device) error {
 				false,
 				device.Hidden))
 		}
-		if device.Removable {
-			err = multierr.Append(err, errInvalidDrive(
-				"Removable",
-				false,
-				device.Removable))
-		}
 		if device.SwapOn {
 			err = multierr.Append(err, errInvalidDrive(
 				"SwapOn",