use supports_FCD_transaction wcp capability to enabled transaction support (#3509)

Author: divyenpatel

manifests/supervisorcluster/1.29/cns-csi.yaml

@@ -574,7 +574,6 @@ data:
   "workload-domain-isolation": "false"
   "sv-pvc-snapshot-protection-finalizer": "false"
   "file-volume-with-vm-service": "false"
-  "csi-transaction-support": "false"
 kind: ConfigMap
 metadata:
   name: csi-feature-states

manifests/supervisorcluster/1.30/cns-csi.yaml

@@ -573,7 +573,6 @@ data:
   "workload-domain-isolation": "false"
   "sv-pvc-snapshot-protection-finalizer": "false"
   "file-volume-with-vm-service": "false"
-  "csi-transaction-support": "false"
 kind: ConfigMap
 metadata:
   name: csi-feature-states

manifests/supervisorcluster/1.31/cns-csi.yaml

@@ -573,7 +573,6 @@ data:
   "workload-domain-isolation": "false"
   "sv-pvc-snapshot-protection-finalizer": "false"
   "file-volume-with-vm-service": "false"
-  "csi-transaction-support": "false"
 kind: ConfigMap
 metadata:
   name: csi-feature-states

manifests/supervisorcluster/1.32/cns-csi.yaml

@@ -576,7 +576,6 @@ data:
   "workload-domain-isolation": "false"
   "sv-pvc-snapshot-protection-finalizer": "false"
   "file-volume-with-vm-service": "false"
-  "csi-transaction-support": "false"
 kind: ConfigMap
 metadata:
   name: csi-feature-states

pkg/csi/service/common/commonco/k8sorchestrator/k8sorchestrator.go

@@ -1102,6 +1102,7 @@ func (c *K8sOrchestrator) HandleLateEnablementOfCapability(ctx context.Context,
 	clusterFlavor cnstypes.CnsClusterFlavor, capability,
 	gcPort, gcEndpoint string) {
 	log := logger.GetLogger(ctx)
+	log.Infof("Starting a routine to handle late enablement for capability: %q", capability)
 	var restClientConfig *restclient.Config
 	var err error
 

pkg/csi/service/common/commonco/k8sorchestrator/topology.go

@@ -1874,6 +1874,10 @@ func (c *K8sOrchestrator) GetActiveClustersForNamespaceInRequestedZones(ctx cont
 		}
 		activeClusters = append(activeClusters, clusters...)
 	}
+	if len(activeClusters) == 0 {
+		return nil, logger.LogNewErrorf(log, "could not find active cluster for the namespace  %q "+
+			"in requested zones: %v", targetNS, requestedZones)
+	}
 	log.Infof("active clusters: %v for namespace: %q in requested zones: %v", activeClusters, targetNS, requestedZones)
 	return activeClusters, nil
 }

pkg/csi/service/common/constants.go

@@ -444,8 +444,10 @@ const (
 	FileVolumesWithVmService = "file-volume-with-vm-service"
 	// SharedDiskFss is an FSS that tells whether shared disks are supported or not
 	SharedDiskFss = "supports_shared_disks_with_VM_service_VMs"
-	// CSITranSactionSupport is an FSS for transaction support
-	CSITranSactionSupport = "csi-transaction-support"
+	// FCDTransactionSupport is the wcp capability that tells whether transaction is supported in CSI
+	FCDTransactionSupport = "supports_FCD_transaction"
+	// CSITransactionSupport is an FSS for transaction support
+	CSITransactionSupport = "csi-transaction-support"
 	// VolFromSnapshotOnTargetDs is a FSS that tells whether creation of volumes from
 	// snapshots on different datastores feature is supported in CSI.
 	VolFromSnapshotOnTargetDs = "supports_vol_from_snapshot_on_target_ds"
@@ -472,17 +474,20 @@ var WCPFeatureStates = map[string]struct{}{
 	StoragePolicyReservationSupport: {},
 	WCPVMServiceVMSnapshots:         {},
 	BYOKEncryption:                  {},
+	FCDTransactionSupport:           {},
+	MultipleClustersPerVsphereZone:  {},
 }
 
 // WCPFeatureStatesSupportsLateEnablement contains capabilities that can be enabled later
 // after CSI upgrade
 // During FSS check if driver detects that the capabilities is disabled in the cached configmap,
 // it will re-fetch the configmap and update the cached configmap.
 var WCPFeatureStatesSupportsLateEnablement = map[string]struct{}{
-	WorkloadDomainIsolation: {},
-	LinkedCloneSupport:      {},
-	WCPVMServiceVMSnapshots: {},
-	BYOKEncryption:          {},
+	WorkloadDomainIsolation:        {},
+	LinkedCloneSupport:             {},
+	MultipleClustersPerVsphereZone: {},
+	WCPVMServiceVMSnapshots:        {},
+	BYOKEncryption:                 {},
 }
 
 // WCPFeatureAssociatedWithPVCSI contains FSS name used in PVCSI and associated WCP Capability name on a

pkg/csi/service/vanilla/controller.go

@@ -136,7 +136,7 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
 		common.CnsMgrSuspendCreateVolume)
 	isTopologyAwareFileVolumeEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
 		common.TopologyAwareFileVolume)
-	isCSITransactionSupportEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITranSactionSupport)
+	isCSITransactionSupportEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITransactionSupport)
 
 	vcManager := cnsvsphere.GetVirtualCenterManager(ctx)
 	if !multivCenterCSITopologyEnabled {

pkg/csi/service/wcp/controller.go

@@ -529,7 +529,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 	topologyRequirement = req.GetAccessibilityRequirements()
 	filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
 	isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
-	isCSITransactionSupportEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITranSactionSupport)
+	isFCDTransactionSupportEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.FCDTransactionSupport)
 
 	topoSegToDatastoresMap := make(map[string][]*cnsvsphere.DatastoreInfo)
 	if isTKGSHAEnabled {
@@ -840,7 +840,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
 		FilterSuspendedDatastores:      filterSuspendedDatastores,
 		UseSupervisorId:                isTKGSHAEnabled,
 		IsByokEnabled:                  isByokEnabled,
-		IsCSITransactionSupportEnabled: isCSITransactionSupportEnabled,
+		IsCSITransactionSupportEnabled: isFCDTransactionSupportEnabled,
 		VolFromSnapshotOnTargetDs:      volFromSnapshotOnTargetDs,
 	}
 
@@ -2440,8 +2440,8 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
 		var cnsVolumeInfo *cnsvolumeinfov1alpha1.CNSVolumeInfo
 		isStorageQuotaM2FSSEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
 			common.StorageQuotaM2)
-		isCSITransactionSupportEnabled := commonco.ContainerOrchestratorUtility.
-			IsFSSEnabled(ctx, common.CSITranSactionSupport)
+		isFCDTransactionSupportEnabled := commonco.ContainerOrchestratorUtility.
+			IsFSSEnabled(ctx, common.FCDTransactionSupport)
 		if isStorageQuotaM2FSSEnabled {
 			cnsVolumeInfo, err = volumeInfoService.GetVolumeInfoForVolumeID(ctx, volumeID)
 			if err != nil {
@@ -2455,7 +2455,7 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
 					Namespace:                      cnsVolumeInfo.Spec.Namespace,
 					Capacity:                       cnsVolumeInfo.Spec.Capacity,
 					IsStorageQuotaM2FSSEnabled:     isStorageQuotaM2FSSEnabled,
-					IsCSITransactionSupportEnabled: isCSITransactionSupportEnabled,
+					IsCSITransactionSupportEnabled: isFCDTransactionSupportEnabled,
 				})
 			if err != nil {
 				return nil, logger.LogNewErrorCodef(log, codes.Internal,