Merge pull request #1051 from mattcary/unstage-disable

Disable device when unstaging

Author: k8s-ci-robot

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

@@ -364,6 +364,13 @@ 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, stagingTargetPath))
 	}
 
+	devicePath, err := getDevicePath(ns, volumeID, "" /* partition, which is unused */)
+	if err != nil {
+		klog.Errorf("Failed to find device path for volume %s. Device may not be detached cleanly (error is ignored and unstaging is continuing): %v", volumeID, err)
+	} else if err := ns.DeviceUtils.DisableDevice(devicePath); err != nil {
+		klog.Errorf("Failed to disabled device %s for volume %s. Device may not be detached cleanly (error is ignored and unstaging is continuing): %v", devicePath, volumeID, err)
+	}
+
 	klog.V(4).Infof("NodeUnstageVolume succeeded on %v from %s", volumeID, stagingTargetPath)
 	return &csi.NodeUnstageVolumeResponse{}, nil
 }

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

@@ -93,6 +93,11 @@ func getDevicePath(ns *GCENodeServer, volumeID, partition string) (string, error
 	return proxy.GetDiskNumber(deviceName, partition, volumeKey.Name)
 }
 
+func disableDevice(devicePath string) error {
+	// This is a no-op on windows.
+	return nil
+}
+
 func getBlockSizeBytes(devicePath string, m *mount.SafeFormatAndMount) (int64, error) {
 	proxy, ok := m.Interface.(mounter.CSIProxyMounter)
 	if !ok {

pkg/mount-manager/device-utils.go

@@ -80,6 +80,10 @@ type DeviceUtils interface {
 	// VerifyDevicePath returns the first of the list of device paths that
 	// 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
 }
 
 type deviceUtils struct {

pkg/mount-manager/device-utils_linux.go

@@ -0,0 +1,28 @@
+//go:build linux
+
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package mountmanager
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+func (_ *deviceUtils) DisableDevice(devicePath string) error {
+	deviceName := filepath.Base(devicePath)
+	return os.WriteFile(fmt.Sprintf("/sys/block/%s/device/state", deviceName), []byte("offline"), 0644)
+}

pkg/mount-manager/device-utils_windows.go

@@ -0,0 +1,22 @@
+//go:build windows
+
+/*
+Copyright 2022 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package mountmanager
+
+func (_ *deviceUtils) DisableDevice(devicePath string) error {
+	// No disabling is necessary on windows.
+	return nil
+}

pkg/mount-manager/fake-device-utils.go

@@ -25,12 +25,16 @@ func NewFakeDeviceUtils() *fakeDeviceUtils {
 
 // Returns list of all /dev/disk/by-id/* paths for given PD.
 func (m *fakeDeviceUtils) GetDiskByIdPaths(pdName string, partition string) []string {
-	// Don't need to implement this in the fake because we have no actual device paths
-	return nil
+	return []string{"/dev/disk/fake-path"}
 }
 
 // Returns the first path that exists, or empty string if none exist.
 func (m *fakeDeviceUtils) VerifyDevicePath(devicePaths []string, diskName string) (string, error) {
 	// Return any random device path to use as mount source
 	return "/dev/disk/fake-path", nil
 }
+
+func (_ *fakeDeviceUtils) DisableDevice(devicePath string) error {
+	// No-op for testing.
+	return nil
+}