Skip to content

Commit 424b707

Browse files
johnchobroadcomjohnchobroadcom
committed
Remove FSS cnsmgr-suspend-create-volume
1 parent f03e1fe commit 424b707

File tree

9 files changed

+19
-42
lines changed

9 files changed

+19
-42
lines changed

‎manifests/guestcluster/1.33/pvcsi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,6 @@ data:
666666
"csi-sv-feature-states-replication": "false" # Do not enable for guest cluster, Refer PR#2386 for details
667667
"block-volume-snapshot": "true"
668668
"tkgs-ha": "true"
669-
"cnsmgr-suspend-create-volume": "true"
670669
"csi-windows-support": "true"
671670
"workload-domain-isolation": "true"
672671
"sv-pvc-snapshot-protection-finalizer": "false"

‎manifests/supervisorcluster/1.32/cns-csi.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,6 @@ data:
560560
"sibling-replica-bound-pvc-check": "true"
561561
"tkgs-ha": "true"
562562
"list-volumes": "true"
563-
"cnsmgr-suspend-create-volume": "true"
564563
"storage-quota-m2": "true"
565564
"vdpp-on-stretched-supervisor": "true"
566565
"cns-unregister-volume": "false"

‎pkg/common/unittestcommon/utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
7070
"csi-windows-support": "true",
7171
"use-csinode-id": "true",
7272
"pv-to-backingdiskobjectid-mapping": "false",
73-
"cnsmgr-suspend-create-volume": "true",
7473
"topology-preferential-datastores": "true",
7574
"max-pvscsi-targets-per-vm": "true",
7675
"multi-vcenter-csi-topology": "true",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
362362
common.BlockVolumeSnapshot: {},
363363
common.CSIWindowsSupport: {},
364364
common.ListVolumes: {},
365-
common.CnsMgrSuspendCreateVolume: {},
366365
common.TopologyPreferentialDatastores: {},
367366
common.MaxPVSCSITargetsPerVM: {},
368367
common.MultiVCenterCSITopology: {},

‎pkg/csi/service/common/constants.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -413,8 +413,6 @@ const (
413413
ListVolumes = "list-volumes"
414414
// PVtoBackingDiskObjectIdMapping is the feature to support pv to backingDiskObjectId mapping on vSphere CSI driver.
415415
PVtoBackingDiskObjectIdMapping = "pv-to-backingdiskobjectid-mapping"
416-
// Block Create Volume for datastores that are in suspended mode
417-
CnsMgrSuspendCreateVolume = "cnsmgr-suspend-create-volume"
418416
// TopologyPreferentialDatastores is the feature gate for preferential
419417
// datastore deployment in topology aware environments.
420418
TopologyPreferentialDatastores = "topology-preferential-datastores"

‎pkg/csi/service/common/vsphereutil.go

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ type VanillaCreateBlockVolParamsForMultiVC struct {
5555

5656
// CreateBlockVolumeOptions defines the FSS required to create a block volume.
5757
type CreateBlockVolumeOptions struct {
58-
FilterSuspendedDatastores,
5958
UseSupervisorId,
6059
IsVdppOnStretchedSvFssEnabled bool
6160
IsByokEnabled bool
@@ -101,7 +100,6 @@ func CreateBlockVolumeUtil(
101100

102101
var clusterMorefs []vim25types.ManagedObjectReference
103102
var datastoreInfoList []*vsphere.DatastoreInfo
104-
105103
var containerClusterArray []cnstypes.CnsContainerCluster
106104
clusterID := manager.CnsConfig.Global.ClusterID
107105
if opts.UseSupervisorId {
@@ -146,12 +144,10 @@ func CreateBlockVolumeUtil(
146144
createSpec.ActiveClusters = clusterMorefs
147145
} else {
148146
var datastores []vim25types.ManagedObjectReference
149-
if opts.FilterSuspendedDatastores {
150-
sharedDatastores, err = vsphere.FilterSuspendedDatastores(ctx, sharedDatastores)
151-
if err != nil {
152-
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
153-
return nil, csifault.CSIInternalFault, err
154-
}
147+
sharedDatastores, err = vsphere.FilterSuspendedDatastores(ctx, sharedDatastores)
148+
if err != nil {
149+
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
150+
return nil, csifault.CSIInternalFault, err
155151
}
156152

157153
var datastoreObj *vsphere.Datastore
@@ -177,7 +173,7 @@ func CreateBlockVolumeUtil(
177173
continue
178174
}
179175

180-
if opts.FilterSuspendedDatastores && vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
176+
if vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
181177
continue
182178
}
183179
datastoreObj = datastoreInfoObj.Datastore
@@ -223,7 +219,7 @@ func CreateBlockVolumeUtil(
223219
continue
224220
}
225221

226-
if opts.FilterSuspendedDatastores && vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
222+
if vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
227223
continue
228224
}
229225
datastoreObj = datastoreInfoObj.Datastore
@@ -585,7 +581,7 @@ func CreateBlockVolumeUtilForMultiVC(ctx context.Context, reqParams interface{},
585581
func CreateFileVolumeUtil(ctx context.Context, clusterFlavor cnstypes.CnsClusterFlavor,
586582
vc *vsphere.VirtualCenter, volumeManager cnsvolume.Manager, cnsConfig *config.Config, spec *CreateVolumeSpec,
587583
datastores []*vsphere.DatastoreInfo, vSphereClusterMorefs []string,
588-
filterSuspendedDatastores, useSupervisorId bool, extraParams interface{}) (
584+
useSupervisorId bool, extraParams interface{}) (
589585
*cnsvolume.CnsVolumeInfo, string, error) {
590586
log := logger.GetLogger(ctx)
591587
var err error
@@ -600,15 +596,12 @@ func CreateFileVolumeUtil(ctx context.Context, clusterFlavor cnstypes.CnsCluster
600596
return nil, csifault.CSIInternalFault, err
601597
}
602598
}
603-
604599
var datastoreMorefs []vim25types.ManagedObjectReference
605600
if len(datastores) != 0 {
606-
if filterSuspendedDatastores {
607-
datastores, err = vsphere.FilterSuspendedDatastores(ctx, datastores)
608-
if err != nil {
609-
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
610-
return nil, csifault.CSIInternalFault, err
611-
}
601+
datastores, err = vsphere.FilterSuspendedDatastores(ctx, datastores)
602+
if err != nil {
603+
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
604+
return nil, csifault.CSIInternalFault, err
612605
}
613606
if spec.ScParams.DatastoreURL == "" {
614607
datastoreMorefs = getDatastoreMoRefs(datastores)

‎pkg/csi/service/vanilla/controller.go

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ var (
9191

9292
// The following variables hold feature states for multi-vcenter-csi-topology, CSI Migration
9393
// and authorisation check.
94-
multivCenterCSITopologyEnabled, csiMigrationEnabled, filterSuspendedDatastores,
94+
multivCenterCSITopologyEnabled, csiMigrationEnabled,
9595
isTopologyAwareFileVolumeEnabled, isCSITransactionSupportEnabled bool
9696

9797
// variables for list volumes
@@ -132,8 +132,6 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
132132
multivCenterCSITopologyEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
133133
common.MultiVCenterCSITopology)
134134
csiMigrationEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSIMigration)
135-
filterSuspendedDatastores = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
136-
common.CnsMgrSuspendCreateVolume)
137135
isTopologyAwareFileVolumeEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
138136
common.TopologyAwareFileVolume)
139137
isCSITransactionSupportEnabled = commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITranSactionSupport)
@@ -782,9 +780,7 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
782780

783781
volumeInfo, faultType, err = common.CreateBlockVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
784782
c.manager, &createVolumeSpec, sharedDatastores, []string{},
785-
common.CreateBlockVolumeOptions{
786-
FilterSuspendedDatastores: filterSuspendedDatastores,
787-
},
783+
common.CreateBlockVolumeOptions{},
788784
nil)
789785
if err != nil {
790786
return nil, faultType, logger.LogNewErrorCodef(log, codes.Internal,
@@ -1909,7 +1905,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
19091905
// moving unto next VC. Need to throw a custom error for such scenarios.
19101906
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
19111907
vcenter, c.managers.VolumeManagers[vcHost], c.managers.CnsConfig, &createVolumeSpec,
1912-
fsEnabledCandidateDatastores, []string{}, filterSuspendedDatastores, false, nil)
1908+
fsEnabledCandidateDatastores, []string{}, false, nil)
19131909
if err != nil {
19141910
log.Error(err)
19151911
combinedErrMssgs = append(combinedErrMssgs, err.Error())
@@ -1967,7 +1963,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
19671963
}
19681964
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
19691965
vcenter, c.managers.VolumeManagers[vcHost], c.managers.CnsConfig, &createVolumeSpec,
1970-
filteredDatastores, []string{}, filterSuspendedDatastores, false, nil)
1966+
filteredDatastores, []string{}, false, nil)
19711967
if err != nil {
19721968
return nil, faultType, logger.LogNewErrorCodef(log, codes.Internal,
19731969
"failed to create volume. Error: %+v", err)
@@ -1981,7 +1977,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
19811977
}
19821978
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
19831979
vcenter, c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec,
1984-
filteredDatastores, []string{}, filterSuspendedDatastores, false, nil)
1980+
filteredDatastores, []string{}, false, nil)
19851981
if err != nil {
19861982
return nil, faultType, logger.LogNewErrorCodef(log, codes.Internal,
19871983
"failed to create volume. Error: %+v", err)

‎pkg/csi/service/wcp/controller.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
500500
}
501501
// Fetch the accessibility requirements from the request.
502502
topologyRequirement = req.GetAccessibilityRequirements()
503-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
504503
isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
505504
isCSITransactionSupportEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITranSactionSupport)
506505
isMultipleClustersPerVsphereZoneEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
@@ -797,7 +796,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
797796
volFromSnapshotOnTargetDs := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
798797
common.VolFromSnapshotOnTargetDs)
799798
createVolumeOpts := common.CreateBlockVolumeOptions{
800-
FilterSuspendedDatastores: filterSuspendedDatastores,
801799
UseSupervisorId: isTKGSHAEnabled,
802800
IsVdppOnStretchedSvFssEnabled: isVdppOnStretchedSVEnabled,
803801
IsByokEnabled: isByokEnabled,
@@ -1321,7 +1319,6 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
13211319
VolumeType: common.FileVolumeType,
13221320
}
13231321

1324-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
13251322
isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
13261323
topoSegToDatastoresMap := make(map[string][]*cnsvsphere.DatastoreInfo)
13271324

@@ -1462,7 +1459,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
14621459
if isPodVMOnStretchSupervisorFSSEnabled {
14631460
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorWorkload, vc,
14641461
c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec, candidateDatastores, vSphereClusterMorefs,
1465-
filterSuspendedDatastores, isTKGSHAEnabled, &cnsvolume.CreateVolumeExtraParams{
1462+
isTKGSHAEnabled, &cnsvolume.CreateVolumeExtraParams{
14661463
VolSizeBytes: volSizeBytes,
14671464
StorageClassName: req.Parameters[common.AttributeStorageClassName],
14681465
Namespace: req.Parameters[common.AttributePvcNamespace],
@@ -1472,7 +1469,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
14721469
} else {
14731470
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorWorkload, vc,
14741471
c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec, candidateDatastores, []string{},
1475-
filterSuspendedDatastores, isTKGSHAEnabled, nil)
1472+
isTKGSHAEnabled, nil)
14761473
}
14771474
if err != nil {
14781475
return nil, faultType, logger.LogNewErrorCodef(log, codes.Internal,

‎pkg/syncer/storagepool/migrationController.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ import (
3636
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/cns-lib/volume"
3737
cnsvsphere "sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/cns-lib/vsphere"
3838
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/config"
39-
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common"
40-
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common/commonco"
4139
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/logger"
4240
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/syncer/k8scloudoperator"
4341
)
@@ -79,8 +77,7 @@ func (m *migrationController) relocateCNSVolume(ctx context.Context, volumeID st
7977
return fmt.Errorf("failed to get datastore corresponding to URL %v", datastoreURL)
8078
}
8179

82-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
83-
if filterSuspendedDatastores && cnsvsphere.IsVolumeCreationSuspended(ctx, dsInfo) {
80+
if cnsvsphere.IsVolumeCreationSuspended(ctx, dsInfo) {
8481
return fmt.Errorf("datastore corresponding to URL %v is suspended and not available for relocating volumes",
8582
datastoreURL)
8683
}

0 commit comments

Comments
 (0)