Remove unused DisableDevice

Author: mattcary

pkg/deviceutils/device-utils.go

@@ -86,10 +86,6 @@ type DeviceUtils interface {
 	// exists on the machine, or an empty string if none exists
 	VerifyDevicePath(devicePaths []string, deviceName string) (string, error)
 
-	// DisableDevice performs necessary disabling prior to a device being
-	// detached from a node. The path is that from GetDiskByIdPaths.
-	DisableDevice(devicePath string) error
-
 	// Resize returns whether or not a device needs resizing.
 	Resize(resizer resizefs.Resizefs, devicePath string, deviceMountPath string) (bool, error)
 

pkg/deviceutils/device-utils_linux.go

@@ -24,18 +24,6 @@ import (
 	"k8s.io/mount-utils"
 )
 
-// DisableDevice asks the kernel to disable a device via /sys.
-// NB: this can be dangerous to use. Once a device is disabled, it's unusable, and can't be enabled
-// unless the serial number is known. But the serial number cannot be read from the device as it's
-// disabled. If a device is disabled in NodeUnstage, and then NodeStage is called without a
-// NodeUnpublish & publish sequence, the disabled state of the device will cause NodeStage to fail.
-// So this can only be used if we track the serial numbers of disabled devices in a persisent way
-// that survives driver restarts.
-func (_ *deviceUtils) DisableDevice(devicePath string) error {
-	deviceName := filepath.Base(devicePath)
-	return os.WriteFile(fmt.Sprintf("/sys/block/%s/device/state", deviceName), []byte("offline\n"), 0644)
-}
-
 func (_ *deviceUtils) IsDeviceFilesystemInUse(mounter *mount.SafeFormatAndMount, devicePath, devFsPath string) (bool, error) {
 	fstype, err := mounter.GetDiskFormat(devicePath)
 	if err != nil {

pkg/gce-pd-csi-driver/node.go

@@ -451,10 +451,10 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
 		return nil, status.Error(codes.Internal, fmt.Sprintf("NodeUnstageVolume failed: %v\nUnmounting arguments: %s\n", err.Error(), stagingTargetPath))
 	}
 
-	if err := ns.safelyDisableDevice(volumeID); err != nil {
+	if err := ns.confirmDeviceUnused(volumeID); err != nil {
 		var targetErr *ignoreableError
 		if errors.As(err, &targetErr) {
-			klog.Warningf("Device may not be detached cleanly for volume %s (ignored, unstaging continues): %v", volumeID, err)
+			klog.Warningf("Unabled to check if device for %s is unused. Device has been unmounted successfully. Ignoring and continuing with unstaging. (%v)", volumeID, err)
 		} else {
 			return nil, status.Errorf(codes.Internal, "NodeUnstageVolume for volume %s failed: %v", volumeID, err)
 		}
@@ -467,7 +467,7 @@ func (ns *GCENodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUns
 // A private error wrapper used to pass control flow decisions up to the caller
 type ignoreableError struct{ error }
 
-func (ns *GCENodeServer) safelyDisableDevice(volumeID string) error {
+func (ns *GCENodeServer) confirmDeviceUnused(volumeID string) error {
 	devicePath, err := getDevicePath(ns, volumeID, "" /* partition, which is unused */)
 	if err != nil {
 		return &ignoreableError{fmt.Errorf("failed to find device path for volume %s: %v", volumeID, err.Error())}