nodeUnstageNVMeVolume idempotentcy changes

Idempotency changes for NVMe unstage

Author: jharrod

frontend/csi/node_server.go

@@ -93,6 +93,8 @@ var (
 	betweenAttachAndLUKSPassphrase = fiji.Register("betweenAttachAndLUKSPassphrase", "node_server")
 	duringIscsiLogout              = fiji.Register("duringIscsiLogout", "node_server")
 	afterInitialTrackingInfoWrite  = fiji.Register("afterInitialTrackingInfoWrite", "node_server")
+	afterNvmeLuksDeviceClosed      = fiji.Register("afterNvmeLuksDeviceClosed", "node_server")
+	afterNvmeDisconnect            = fiji.Register("afterNvmeDisconnect", "node_server")
 )
 
 const (
@@ -2930,8 +2932,8 @@ func (p *Plugin) nodeUnstageNVMeVolume(
 
 		luksMapperPath, err = p.devices.GetLUKSDeviceForMultipathDevice(devicePath)
 		if err != nil {
-			Logc(ctx).WithFields(fields).WithError(err).Error("Failed to get LUKS device path from device path.")
-			return &csi.NodeUnstageVolumeResponse{}, err
+			Logc(ctx).WithFields(fields).WithError(err).Debug("Failed to get LUKS device path from device path. " +
+				"Device may already be removed.")
 		}
 
 		if luksMapperPath != "" {
@@ -2943,6 +2945,9 @@ func (p *Plugin) nodeUnstageNVMeVolume(
 				}
 				Logc(ctx).WithFields(fields).WithError(err).Debug("LUKS close wait time exceeded, continuing with device removal.")
 			}
+			if err := afterNvmeLuksDeviceClosed.Inject(); err != nil {
+				return nil, err
+			}
 		}
 	}
 
@@ -2994,6 +2999,9 @@ func (p *Plugin) nodeUnstageNVMeVolume(
 			).WithError(err).Debug("Error disconnecting subsystem.")
 		}
 	}
+	if err := afterNvmeDisconnect.Inject(); err != nil {
+		return nil, err
+	}
 
 	volumeId, stagingTargetPath, err := p.getVolumeIdAndStagingPath(req)
 	if err != nil {

utils/nvme/nvme.go

@@ -154,7 +154,7 @@ func (s *NVMeSubsystem) GetNamespaceCount(ctx context.Context) (int, error) {
 	return count, nil
 }
 
-func (s *NVMeSubsystem) GetNVMeDevice(ctx context.Context, nsUUID string) (NVMeDeviceInterface, error) {
+func (s *NVMeSubsystem) GetNVMeDevice(ctx context.Context, nsUUID string) (*NVMeDevice, error) {
 	Logc(ctx).Debug(">>>> nvme.GetNVMeDevice")
 	defer Logc(ctx).Debug("<<<< nvme.GetNVMeDevice")
 

utils/nvme/nvme_darwin.go

@@ -71,7 +71,7 @@ func (s *NVMeSubsystem) GetNVMeDeviceCountAt(ctx context.Context, path string) (
 	return 0, errors.UnsupportedError("GetNVMeDeviceCountAt is not supported for darwin")
 }
 
-func (s *NVMeSubsystem) GetNVMeDeviceAt(ctx context.Context, nsUUID string) (NVMeDeviceInterface, error) {
+func (s *NVMeSubsystem) GetNVMeDeviceAt(ctx context.Context, nsUUID string) (*NVMeDevice, error) {
 	Logc(ctx).Debug(">>>> nvme_darwin.GetNVMeDeviceAt")
 	defer Logc(ctx).Debug("<<<< nvme_darwin.GetNVMeDeviceAt")
 	return nil, errors.UnsupportedError("GetNVMeDeviceAt is not supported for darwin")

utils/nvme/nvme_linux.go

@@ -6,6 +6,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
 	"regexp"
 	"strings"
 	"time"
@@ -307,12 +308,15 @@ func (s *NVMeSubsystem) GetNVMeDeviceCountAt(ctx context.Context, path string) (
 	return count, nil
 }
 
-func (s *NVMeSubsystem) GetNVMeDeviceAt(ctx context.Context, nsUUID string) (NVMeDeviceInterface, error) {
+func (s *NVMeSubsystem) GetNVMeDeviceAt(ctx context.Context, nsUUID string) (*NVMeDevice, error) {
 	Logc(ctx).Trace(">>>> nvme_linux.GetNVMeDeviceAt")
 	defer Logc(ctx).Trace("<<<< nvme_linux.GetNVMeDeviceAt")
 
 	pathContents, err := afero.ReadDir(s.osFs, s.Name)
 	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, errors.NotFoundError("NVMe directory %s not found: %v", s.Name, err)
+		}
 		return nil, fmt.Errorf("failed to open %s directory, %v", s.Name, err)
 	}
 

utils/nvme/nvme_types.go

@@ -142,8 +142,8 @@ type NVMeSubsystemInterface interface {
 	ConnectSubsystemToHost(ctx context.Context, IP string) error
 	DisconnectSubsystemFromHost(ctx context.Context) error
 	GetNamespaceCountForSubsDevice(ctx context.Context) (int, error)
-	GetNVMeDevice(ctx context.Context, nsUUID string) (NVMeDeviceInterface, error)
-	GetNVMeDeviceAt(ctx context.Context, nsUUID string) (NVMeDeviceInterface, error)
+	GetNVMeDevice(ctx context.Context, nsUUID string) (*NVMeDevice, error)
+	GetNVMeDeviceAt(ctx context.Context, nsUUID string) (*NVMeDevice, error)
 	GetNVMeDeviceCountAt(ctx context.Context, path string) (int, error)
 }
 

utils/nvme/nvme_windows.go

@@ -70,7 +70,7 @@ func (s *NVMeSubsystem) GetNVMeDeviceCountAt(ctx context.Context, path string) (
 	return 0, errors.UnsupportedError("GetNVMeDeviceCountAt is not supported for windows")
 }
 
-func (s *NVMeSubsystem) GetNVMeDeviceAt(ctx context.Context, nsUUID string) (NVMeDeviceInterface, error) {
+func (s *NVMeSubsystem) GetNVMeDeviceAt(ctx context.Context, nsUUID string) (*NVMeDevice, error) {
 	Logc(ctx).Debug(">>>> nvme_windows.GetNVMeDeviceAt")
 	defer Logc(ctx).Debug("<<<< nvme_windows.GetNVMeDeviceAt")
 	return nil, errors.UnsupportedError("GetNVMeDeviceAt is not supported for windows")