Disable ASA R2 backends with concurrent core

Author: clintonk

config/config.go

@@ -444,6 +444,17 @@ var (
 	K8sAPIQPS   float32
 	K8sAPIBurst int
 
+	// Concurrency context
+	IsConcurrent       bool
+	ConcurrentBackends = []string{
+		"ontap-san",
+		"fake",
+		"ontap-nas",
+		"google-cloud-netapp-volumes",
+		"ontap-nas-economy",
+		"ontap-san-economy",
+	}
+
 	// Absolute max age for ANY TAGRI (safety net to prevent stuck states) before forced deletion
 	TagriTimeout time.Duration
 

core/concurrent_core.go

@@ -64,15 +64,7 @@ type ConcurrentTridentOrchestrator struct {
 }
 
 var (
-	_                 Orchestrator = &ConcurrentTridentOrchestrator{}
-	supportedBackends              = []string{
-		"ontap-san",
-		"fake",
-		"ontap-nas",
-		"google-cloud-netapp-volumes",
-		"ontap-nas-economy",
-		"ontap-san-economy",
-	}
+	_ Orchestrator = &ConcurrentTridentOrchestrator{}
 )
 
 func NewConcurrentTridentOrchestrator(client persistentstore.Client) (Orchestrator, error) {
@@ -177,6 +169,7 @@ func (o *ConcurrentTridentOrchestrator) transformPersistentState(ctx context.Con
 }
 
 func (o *ConcurrentTridentOrchestrator) Bootstrap(_ bool) error {
+	config.IsConcurrent = true
 	ctx := GenerateRequestContext(nil, "", ContextSourceInternal, WorkflowCoreBootstrap, LogLayerCore)
 	var err error
 
@@ -851,7 +844,7 @@ func (o *ConcurrentTridentOrchestrator) validateAndCreateBackendFromConfig(
 
 	commonConfig.Flags[FlagConcurrent] = "true"
 
-	if !collection.StringInSlice(commonConfig.StorageDriverName, supportedBackends) {
+	if !collection.StringInSlice(commonConfig.StorageDriverName, config.ConcurrentBackends) {
 		return nil, fmt.Errorf("backend type %s is not yet supported by concurrent Trident",
 			commonConfig.StorageDriverName)
 	}

storage_drivers/ontap/ontap_factory.go

@@ -5,6 +5,7 @@ package ontap
 import (
 	"context"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"strconv"
 	"strings"
@@ -121,6 +122,10 @@ func getSANStorageDriverBasedOnPersonality(
 		isASAr2 = true
 	}
 
+	if isASAr2 && config.IsConcurrent {
+		return nil, errors.New("ASA r2 backend type is not yet supported by concurrent Trident")
+	}
+
 	switch driverProtocol {
 	case sa.ISCSI:
 		if isASAr2 {

storage_drivers/ontap/ontap_factory_test.go

@@ -66,6 +66,7 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 
 	tests := []struct {
 		name               string
+		concurrent         bool
 		sanOptimized       bool
 		disaggregated      bool
 		driverProtocol     string
@@ -74,14 +75,34 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 	}{
 		{
 			name:               "ASA optimized and disaggregated with iSCSI",
+			concurrent:         false,
 			sanOptimized:       true,
 			disaggregated:      true,
 			driverProtocol:     sa.ISCSI,
 			expectedDriverType: &ASAStorageDriver{},
 			expectError:        false,
 		},
+		{
+			name:               "ASA optimized and disaggregated with iSCSI, concurrent",
+			concurrent:         true,
+			sanOptimized:       true,
+			disaggregated:      true,
+			driverProtocol:     sa.ISCSI,
+			expectedDriverType: nil,
+			expectError:        true,
+		},
 		{
 			name:               "SAN optimized but not disaggregated with iSCSI",
+			concurrent:         false,
+			sanOptimized:       true,
+			disaggregated:      false,
+			driverProtocol:     sa.ISCSI,
+			expectedDriverType: &SANStorageDriver{},
+			expectError:        false,
+		},
+		{
+			name:               "SAN optimized but not disaggregated with iSCSI, concurrent",
+			concurrent:         true,
 			sanOptimized:       true,
 			disaggregated:      false,
 			driverProtocol:     sa.ISCSI,
@@ -90,6 +111,16 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 		},
 		{
 			name:               "Standard SAN with iSCSI",
+			concurrent:         false,
+			sanOptimized:       false,
+			disaggregated:      false,
+			driverProtocol:     sa.ISCSI,
+			expectedDriverType: &SANStorageDriver{},
+			expectError:        false,
+		},
+		{
+			name:               "Standard SAN with iSCSI, concurrent",
+			concurrent:         true,
 			sanOptimized:       false,
 			disaggregated:      false,
 			driverProtocol:     sa.ISCSI,
@@ -98,6 +129,16 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 		},
 		{
 			name:               "Standard SAN with NVMe",
+			concurrent:         false,
+			sanOptimized:       false,
+			disaggregated:      false,
+			driverProtocol:     sa.NVMe,
+			expectedDriverType: &NVMeStorageDriver{},
+			expectError:        false,
+		},
+		{
+			name:               "Standard SAN with NVMe, concurrent",
+			concurrent:         true,
 			sanOptimized:       false,
 			disaggregated:      false,
 			driverProtocol:     sa.NVMe,
@@ -106,6 +147,16 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 		},
 		{
 			name:               "Standard SAN with FCP",
+			concurrent:         false,
+			sanOptimized:       false,
+			disaggregated:      false,
+			driverProtocol:     sa.FCP,
+			expectedDriverType: &SANStorageDriver{},
+			expectError:        false,
+		},
+		{
+			name:               "Standard SAN with FCP, concurrent",
+			concurrent:         true,
 			sanOptimized:       false,
 			disaggregated:      false,
 			driverProtocol:     sa.FCP,
@@ -114,6 +165,7 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 		},
 		{
 			name:               "Unsupported protocol",
+			concurrent:         false,
 			sanOptimized:       false,
 			disaggregated:      false,
 			driverProtocol:     "unsupported",
@@ -124,6 +176,8 @@ func TestGetSANStorageDriverBasedOnPersonality(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
+			config.IsConcurrent = test.concurrent
+
 			driver, err := getSANStorageDriverBasedOnPersonality(
 				test.sanOptimized, test.disaggregated, test.driverProtocol, &ontapConfig, mockAPI, mockAWSAPI,
 			)