Skip to content

Commit 23d84ae

Browse files
johnchobroadcomjohnchobroadcom
committed
Remove FSS cnsmgr-suspend-create-volume
1 parent 27381f8 commit 23d84ae

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
@@ -665,7 +665,6 @@ data:
665665
"csi-sv-feature-states-replication": "false" # Do not enable for guest cluster, Refer PR#2386 for details
666666
"block-volume-snapshot": "true"
667667
"tkgs-ha": "true"
668-
"cnsmgr-suspend-create-volume": "true"
669668
"csi-windows-support": "true"
670669
"workload-domain-isolation": "true"
671670
"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
@@ -558,7 +558,6 @@ data:
558558
"block-volume-snapshot": "true"
559559
"tkgs-ha": "true"
560560
"list-volumes": "true"
561-
"cnsmgr-suspend-create-volume": "true"
562561
"storage-quota-m2": "true"
563562
"vdpp-on-stretched-supervisor": "true"
564563
"cns-unregister-volume": "false"

‎pkg/common/unittestcommon/utils.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ func GetFakeContainerOrchestratorInterface(orchestratorType int) (commonco.COCom
7171
"csi-windows-support": "true",
7272
"use-csinode-id": "true",
7373
"pv-to-backingdiskobjectid-mapping": "false",
74-
"cnsmgr-suspend-create-volume": "true",
7574
"topology-preferential-datastores": "true",
7675
"multi-vcenter-csi-topology": "true",
7776
"listview-tasks": "true",

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ func getReleasedVanillaFSS() map[string]struct{} {
394394
common.BlockVolumeSnapshot: {},
395395
common.CSIWindowsSupport: {},
396396
common.ListVolumes: {},
397-
common.CnsMgrSuspendCreateVolume: {},
398397
common.TopologyPreferentialDatastores: {},
399398
common.MultiVCenterCSITopology: {},
400399
common.CSIInternalGeneratedClusterID: {},

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,8 +406,6 @@ const (
406406
ListVolumes = "list-volumes"
407407
// PVtoBackingDiskObjectIdMapping is the feature to support pv to backingDiskObjectId mapping on vSphere CSI driver.
408408
PVtoBackingDiskObjectIdMapping = "pv-to-backingdiskobjectid-mapping"
409-
// Block Create Volume for datastores that are in suspended mode
410-
CnsMgrSuspendCreateVolume = "cnsmgr-suspend-create-volume"
411409
// TopologyPreferentialDatastores is the feature gate for preferential
412410
// datastore deployment in topology aware environments.
413411
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
@@ -507,7 +507,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
507507
}
508508
// Fetch the accessibility requirements from the request.
509509
topologyRequirement = req.GetAccessibilityRequirements()
510-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
511510
isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
512511
isCSITransactionSupportEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CSITranSactionSupport)
513512
isMultipleClustersPerVsphereZoneEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
@@ -804,7 +803,6 @@ func (c *controller) createBlockVolume(ctx context.Context, req *csi.CreateVolum
804803
volFromSnapshotOnTargetDs := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx,
805804
common.VolFromSnapshotOnTargetDs)
806805
createVolumeOpts := common.CreateBlockVolumeOptions{
807-
FilterSuspendedDatastores: filterSuspendedDatastores,
808806
UseSupervisorId: isTKGSHAEnabled,
809807
IsVdppOnStretchedSvFssEnabled: isVdppOnStretchedSVEnabled,
810808
IsByokEnabled: isByokEnabled,
@@ -1328,7 +1326,6 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
13281326
VolumeType: common.FileVolumeType,
13291327
}
13301328

1331-
filterSuspendedDatastores := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.CnsMgrSuspendCreateVolume)
13321329
isTKGSHAEnabled := commonco.ContainerOrchestratorUtility.IsFSSEnabled(ctx, common.TKGsHA)
13331330
topoSegToDatastoresMap := make(map[string][]*cnsvsphere.DatastoreInfo)
13341331

@@ -1469,7 +1466,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
14691466
if isPodVMOnStretchSupervisorFSSEnabled {
14701467
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorWorkload, vc,
14711468
c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec, candidateDatastores, vSphereClusterMorefs,
1472-
filterSuspendedDatastores, isTKGSHAEnabled, &cnsvolume.CreateVolumeExtraParams{
1469+
isTKGSHAEnabled, &cnsvolume.CreateVolumeExtraParams{
14731470
VolSizeBytes: volSizeBytes,
14741471
StorageClassName: req.Parameters[common.AttributeStorageClassName],
14751472
Namespace: req.Parameters[common.AttributePvcNamespace],
@@ -1479,7 +1476,7 @@ func (c *controller) createFileVolume(ctx context.Context, req *csi.CreateVolume
14791476
} else {
14801477
volumeInfo, faultType, err = common.CreateFileVolumeUtil(ctx, cnstypes.CnsClusterFlavorWorkload, vc,
14811478
c.manager.VolumeManager, c.manager.CnsConfig, &createVolumeSpec, candidateDatastores, []string{},
1482-
filterSuspendedDatastores, isTKGSHAEnabled, nil)
1479+
isTKGSHAEnabled, nil)
14831480
}
14841481
if err != nil {
14851482
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)