Skip to content

Commit 405df49

Browse files
johnchobroadcomjohnchobroadcom
committed
Remove FSS cnsmgr-suspend-create-volume
1 parent 081b9bc commit 405df49

File tree

9 files changed

+19
-40
lines changed

9 files changed

+19
-40
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
@@ -559,7 +559,6 @@ data:
559559
"sibling-replica-bound-pvc-check": "true"
560560
"tkgs-ha": "true"
561561
"list-volumes": "true"
562-
"cnsmgr-suspend-create-volume": "true"
563562
"storage-quota-m2": "true"
564563
"vdpp-on-stretched-supervisor": "true"
565564
"cns-unregister-volume": "false"

‎pkg/common/unittestcommon/utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
6767
"csi-windows-support": "true",
6868
"use-csinode-id": "true",
6969
"pv-to-backingdiskobjectid-mapping": "false",
70-
"cnsmgr-suspend-create-volume": "true",
7170
"topology-preferential-datastores": "true",
7271
"max-pvscsi-targets-per-vm": "true",
7372
"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
@@ -359,7 +359,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
359359
common.BlockVolumeSnapshot: {},
360360
common.CSIWindowsSupport: {},
361361
common.ListVolumes: {},
362-
common.CnsMgrSuspendCreateVolume: {},
363362
common.TopologyPreferentialDatastores: {},
364363
common.MaxPVSCSITargetsPerVM: {},
365364
common.MultiVCenterCSITopology: {},

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,6 @@ const (
398398
ListVolumes = "list-volumes"
399399
// PVtoBackingDiskObjectIdMapping is the feature to support pv to backingDiskObjectId mapping on vSphere CSI driver.
400400
PVtoBackingDiskObjectIdMapping = "pv-to-backingdiskobjectid-mapping"
401-
// Block Create Volume for datastores that are in suspended mode
402-
CnsMgrSuspendCreateVolume = "cnsmgr-suspend-create-volume"
403401
// TopologyPreferentialDatastores is the feature gate for preferential
404402
// datastore deployment in topology aware environments.
405403
TopologyPreferentialDatastores = "topology-preferential-datastores"

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

Lines changed: 11 additions & 16 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
@@ -92,12 +91,10 @@ func CreateBlockVolumeUtil(
9291
}
9392
}
9493

95-
if opts.FilterSuspendedDatastores {
96-
sharedDatastores, err = vsphere.FilterSuspendedDatastores(ctx, sharedDatastores)
97-
if err != nil {
98-
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
99-
return nil, csifault.CSIInternalFault, err
100-
}
94+
sharedDatastores, err = vsphere.FilterSuspendedDatastores(ctx, sharedDatastores)
95+
if err != nil {
96+
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
97+
return nil, csifault.CSIInternalFault, err
10198
}
10299

103100
var datastoreObj *vsphere.Datastore
@@ -125,7 +122,7 @@ func CreateBlockVolumeUtil(
125122
continue
126123
}
127124

128-
if opts.FilterSuspendedDatastores && vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
125+
if vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
129126
continue
130127
}
131128
datastoreObj = datastoreInfoObj.Datastore
@@ -171,7 +168,7 @@ func CreateBlockVolumeUtil(
171168
continue
172169
}
173170

174-
if opts.FilterSuspendedDatastores && vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
171+
if vsphere.IsVolumeCreationSuspended(ctx, datastoreInfoObj) {
175172
continue
176173
}
177174
datastoreObj = datastoreInfoObj.Datastore
@@ -530,7 +527,7 @@ func CreateBlockVolumeUtilForMultiVC(ctx context.Context, reqParams interface{},
530527
// datastores.
531528
func CreateFileVolumeUtil(ctx context.Context, clusterFlavor cnstypes.CnsClusterFlavor,
532529
vc *vsphere.VirtualCenter, volumeManager cnsvolume.Manager, cnsConfig *config.Config, spec *CreateVolumeSpec,
533-
datastores []*vsphere.DatastoreInfo, filterSuspendedDatastores, useSupervisorId bool, extraParams interface{}) (
530+
datastores []*vsphere.DatastoreInfo, useSupervisorId bool, extraParams interface{}) (
534531
*cnsvolume.CnsVolumeInfo, string, error) {
535532
log := logger.GetLogger(ctx)
536533
var err error
@@ -546,12 +543,10 @@ func CreateFileVolumeUtil(ctx context.Context, clusterFlavor cnstypes.CnsCluster
546543
}
547544
}
548545

549-
if filterSuspendedDatastores {
550-
datastores, err = vsphere.FilterSuspendedDatastores(ctx, datastores)
551-
if err != nil {
552-
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
553-
return nil, csifault.CSIInternalFault, err
554-
}
546+
datastores, err = vsphere.FilterSuspendedDatastores(ctx, datastores)
547+
if err != nil {
548+
log.Errorf("Error occurred while filter suspended datastores, err: %+v", err)
549+
return nil, csifault.CSIInternalFault, err
555550
}
556551

557552
var datastoreMorefs []vim25types.ManagedObjectReference

‎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,
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,
@@ -1900,7 +1896,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
19001896
// moving unto next VC. Need to throw a custom error for such scenarios.
19011897
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
19021898
vcenter, c.managers.VolumeManagers[vcHost], c.managers.CnsConfig, &createVolumeSpec,
1903-
fsEnabledCandidateDatastores, filterSuspendedDatastores, false, nil)
1899+
fsEnabledCandidateDatastores, false, nil)
19041900
if err != nil {
19051901
log.Error(err)
19061902
combinedErrMssgs = append(combinedErrMssgs, err.Error())
@@ -1958,7 +1954,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
19581954
}
19591955
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
19601956
vcenter, c.managers.VolumeManagers[vcHost], c.managers.CnsConfig, &createVolumeSpec,
1961-
filteredDatastores, filterSuspendedDatastores, false, nil)
1957+
filteredDatastores, false, nil)
19621958
if err != nil {
19631959
return nil, faultType, logger.LogNewErrorCodef(log, codes.Internal,
19641960
"failed to create volume. Error: %+v", err)
@@ -1972,7 +1968,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
19721968
}
19731969
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorVanilla,
19741970
vcenter, c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec,
1975-
filteredDatastores, filterSuspendedDatastores, false, nil)
1971+
filteredDatastores, false, nil)
19761972
if err != nil {
19771973
return nil, faultType, logger.LogNewErrorCodef(log, codes.Internal,
19781974
"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
@@ -486,7 +486,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
486486
}
487487
// Fetch the accessibility requirements from the request.
488488
topologyRequirement = req.GetAccessibilityRequirements()
489-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
490489
isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
491490
isCSITransactionSupportEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITranSactionSupport)
492491

@@ -711,7 +710,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
711710
}
712711

713712
createVolumeOpts := common.CreateBlockVolumeOptions{
714-
FilterSuspendedDatastores: filterSuspendedDatastores,
715713
UseSupervisorId: isTKGSHAEnabled,
716714
IsVdppOnStretchedSvFssEnabled: isVdppOnStretchedSVEnabled,
717715
IsByokEnabled: isByokEnabled,
@@ -949,7 +947,6 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
949947
VolumeType: common.FileVolumeType,
950948
}
951949

952-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
953950
isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
954951
topoSegToDatastoresMap := make(map[string][]*cnsvsphere.DatastoreInfo)
955952

@@ -1071,7 +1068,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
10711068
if isPodVMOnStretchSupervisorFSSEnabled {
10721069
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorWorkload, vc,
10731070
c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec, candidateDatastores,
1074-
filterSuspendedDatastores, isTKGSHAEnabled, &cnsvolume.CreateVolumeExtraParams{
1071+
isTKGSHAEnabled, &cnsvolume.CreateVolumeExtraParams{
10751072
VolSizeBytes: volSizeBytes,
10761073
StorageClassName: req.Parameters[common.AttributeStorageClassName],
10771074
Namespace: req.Parameters[common.AttributePvcNamespace],
@@ -1080,7 +1077,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
10801077
} else {
10811078
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorWorkload, vc,
10821079
c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec, candidateDatastores,
1083-
filterSuspendedDatastores, isTKGSHAEnabled, nil)
1080+
isTKGSHAEnabled, nil)
10841081
}
10851082
if err != nil {
10861083
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
@@ -34,8 +34,6 @@ import (
3434
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/cns-lib/volume"
3535
cnsvsphere "sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/cns-lib/vsphere"
3636
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/common/config"
37-
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common"
38-
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/common/commonco"
3937
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/csi/service/logger"
4038
"sigs.k8s.io/vsphere-csi-driver/v3/pkg/syncer/k8scloudoperator"
4139
)
@@ -74,8 +72,7 @@ func (m *migrationController) relocateCNSVolume(ctx context.Context, volumeID st
7472
return fmt.Errorf("failed to get datastore corresponding to URL %v", datastoreURL)
7573
}
7674

77-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
78-
if filterSuspendedDatastores && cnsvsphere.IsVolumeCreationSuspended(ctx, dsInfo) {
75+
if cnsvsphere.IsVolumeCreationSuspended(ctx, dsInfo) {
7976
return fmt.Errorf("datastore corresponding to URL %v is suspended and not available for relocating volumes",
8077
datastoreURL)
8178
}

0 commit comments

Comments
 (0)