Fix NVMe subsystem disconnect logic

Signed-off-by: Meghna Singh <ms73385@netapp.com>

Author: singhmeghna79

frontend/csi/node_server.go

@@ -3480,17 +3480,16 @@ func (p *Plugin) disconnectNVMeSubsystemIfNeeded(
 	defer locks.Unlock(ctx, lockContext, nvmeSubsystemDisconnectLock)
 
 	// Get the number of namespaces associated with the subsystem (inside lock to avoid race conditions)
-	numNs, err := nvmeSubsys.GetNamespaceCount(ctx)
-	if err != nil {
-		Logc(ctx).WithField(
-			"subsystem", publishInfo.NVMeSubsystemNQN,
-		).WithError(err).Debug("Error getting Namespace count.")
-	}
+	numNs := publishedNVMeSessions.GetNamespaceCountForSession(publishInfo.NVMeSubsystemNQN)
+	Logc(ctx).WithFields(LogFields{
+		"subsystem":      publishInfo.NVMeSubsystemNQN,
+		"namespaceCount": numNs,
+		"disconnectFlag": disconnect,
+	}).Info("Checking if subsystem should be disconnected.")
 
-	// If number of namespaces is more than 1, don't disconnect the subsystem. If we get any issues while getting the
-	// number of namespaces through the CLI, we can rely on the disconnect flag from NVMe self-healing sessions (if
+	// If number of namespaces is 0, disconnect the subsystem. we can rely on the disconnect flag from NVMe self-healing sessions (if
 	// NVMe self-healing is enabled), which keeps track of namespaces associated with the subsystem.
-	if (err == nil && numNs <= 1) || (p.nvmeSelfHealingInterval > 0 && err != nil && disconnect) {
+	if (numNs == 0) || (p.nvmeSelfHealingInterval > 0 && disconnect) {
 		if err := nvmeSubsys.Disconnect(ctx); err != nil {
 			Logc(ctx).WithField(
 				"subsystem", publishInfo.NVMeSubsystemNQN,

frontend/csi/node_server_test.go

@@ -12430,7 +12430,7 @@ func TestNodeUnStageVolume(t *testing.T) {
 			setupNVMeHandler: func() nvme.NVMeInterface {
 				mockNvmeHandler := mock_nvme.NewMockNVMeInterface(gomock.NewController(t))
 				mockNvmeHandler.EXPECT().RemovePublishedNVMeSession(gomock.Any(), gomock.Any(), gomock.Any()).Return(false).AnyTimes()
-				mockNvmeHandler.EXPECT().NewNVMeSubsystem(gomock.Any(), gomock.Any()).Return(nvme.NewNVMeSubsystemDetailed("mock-nqn", "mock-name", []nvme.Path{{Address: "mock-address"}}, nil, afero.NewMemMapFs())).AnyTimes()
+				mockNvmeHandler.EXPECT().NewNVMeSubsystem(gomock.Any(), gomock.Any()).Return(nvme.NewNVMeSubsystemDetailed("mock-nqn", "mock-name", []nvme.Path{{Address: "mock-address"}}, execCmd.NewCommand(), afero.NewMemMapFs())).AnyTimes()
 				return mockNvmeHandler
 			},
 			getDeviceClient: func() devices.Devices {

frontend/csi/plugin.go

@@ -431,10 +431,7 @@ func (p *Plugin) Activate() error {
 				Logc(ctx).WithError(err).Warn("Failed to clean node; self-healing features may be unreliable.")
 			}
 
-			// Populate the published sessions IFF iSCSI/NVMe self-healing is enabled.
-			if p.iSCSISelfHealingInterval > 0 || p.nvmeSelfHealingInterval > 0 {
-				p.populatePublishedSessions(ctx)
-			}
+			p.populatePublishedSessions(ctx)
 
 			p.startISCSISelfHealingThread(ctx)
 			p.startNVMeSelfHealingThread(ctx)