@@ -194,7 +194,7 @@ func (c *controller) Init(config *cnsconfig.Config, version string) error {
194194
195195 volumeManager , err := cnsvolume .GetManager (ctx , vcenter , operationStore ,
196196 idempotencyHandlingEnabled , false ,
197- false , cnstypes .CnsClusterFlavorWorkload )
197+ false , cnstypes .CnsClusterFlavorWorkload , config . Global . SupervisorID , config . Global . ClusterDistribution )
198198 if err != nil {
199199 return logger .LogNewErrorf (log , "failed to create an instance of volume manager. err=%v" , err )
200200 }
@@ -431,10 +431,9 @@ func (c *controller) ReloadConfiguration(reconnectToVCFromNewConfig bool) error
431431 return logger .LogNewErrorf (log , "failed to reset volume manager. err=%v" , err )
432432 }
433433 c .manager .VcenterConfig = newVCConfig
434-
435434 volumeManager , err := cnsvolume .GetManager (ctx , vcenter , operationStore ,
436435 idempotencyHandlingEnabled , false ,
437- false , cnstypes .CnsClusterFlavorWorkload )
436+ false , cnstypes .CnsClusterFlavorWorkload , cfg . Global . SupervisorID , cfg . Global . ClusterDistribution )
438437 if err != nil {
439438 return logger .LogNewErrorf (log , "failed to create an instance of volume manager. err=%v" , err )
440439 }
@@ -1726,16 +1725,7 @@ func (c *controller) DeleteVolume(ctx context.Context, req *csi.DeleteVolumeRequ
17261725 return nil , csifault .CSIInvalidArgumentFault , err
17271726 }
17281727 if cnsVolumeType == common .UnknownVolumeType {
1729- cnsVolumeType , err = common .GetCnsVolumeType (ctx , c .manager .VolumeManager , req .VolumeId )
1730- if err != nil {
1731- if err .Error () == common .ErrNotFound .Error () {
1732- // The volume couldn't be found during query, assuming the delete operation as success
1733- return & csi.DeleteVolumeResponse {}, "" , nil
1734- } else {
1735- return nil , csifault .CSIInternalFault , logger .LogNewErrorCodef (log , codes .Internal ,
1736- "failed to determine CNS volume type for volume: %q. Error: %+v" , req .VolumeId , err )
1737- }
1738- }
1728+ cnsVolumeType = common .GetCnsVolumeType (ctx , req .VolumeId )
17391729 volumeType = convertCnsVolumeType (ctx , cnsVolumeType )
17401730 }
17411731 // Check if the volume contains CNS snapshots only for block volumes.
@@ -2437,31 +2427,21 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
24372427 }
24382428 volumeID := req .GetSourceVolumeId ()
24392429 volumeType = prometheus .PrometheusBlockVolumeType
2440- // Query capacity in MB for block volume snapshot
2441- volumeIds := []cnstypes.CnsVolumeId {{Id : volumeID }}
2442- cnsVolumeDetailsMap , err := utils .QueryVolumeDetailsUtil (ctx , c .manager .VolumeManager , volumeIds )
2443- if err != nil {
2444- return nil , err
2445- }
2446- if _ , ok := cnsVolumeDetailsMap [volumeID ]; ! ok {
2447- return nil , logger .LogNewErrorCodef (log , codes .Internal ,
2448- "cns query volume did not return the volume: %s" , volumeID )
2449- }
2450- snapshotSizeInMB := cnsVolumeDetailsMap [volumeID ].SizeInMB
24512430
2452- if cnsVolumeDetailsMap [volumeID ].VolumeType != common .BlockVolumeType {
2431+ cnsvolumeType := common .GetCnsVolumeType (ctx , volumeID )
2432+ if cnsvolumeType != common .BlockVolumeType {
24532433 return nil , logger .LogNewErrorCodef (log , codes .FailedPrecondition ,
2454- "queried volume doesn't have the expected volume type. Expected VolumeType: %v. " +
2455- "Queried VolumeType: %v" , volumeType , cnsVolumeDetailsMap [ volumeID ]. VolumeType )
2434+ "Expected VolumeType: %v. " +
2435+ "Observed VolumeType: %v" , volumeType , cnsvolumeType )
24562436 }
2457-
24582437 // TODO: We may need to add logic to check the limit of max number of snapshots by using
24592438 // GlobalMaxSnapshotsPerBlockVolume etc. variables in the future.
24602439
24612440 // the returned snapshotID below is a combination of CNS VolumeID and CNS SnapshotID concatenated by the "+"
24622441 // sign. That is, a string of "<UUID>+<UUID>". Because, all other CNS snapshot APIs still require both
24632442 // VolumeID and SnapshotID as the input, while corresponding snapshot APIs in upstream CSI require SnapshotID.
24642443 // So, we need to bridge the gap in vSphere CSI driver and return a combined SnapshotID to CSI Snapshotter.
2444+ var err error
24652445 var snapshotID string
24662446 var cnsSnapshotInfo * cnsvolume.CnsSnapshotInfo
24672447 var cnsVolumeInfo * cnsvolumeinfov1alpha1.CNSVolumeInfo
@@ -2517,6 +2497,17 @@ func (c *controller) CreateSnapshot(ctx context.Context, req *csi.CreateSnapshot
25172497 "failed to create snapshot on volume %q with error: %v" , volumeID , err )
25182498 }
25192499 }
2500+ // Query capacity in MB for block volume snapshot
2501+ volumeIds := []cnstypes.CnsVolumeId {{Id : volumeID }}
2502+ cnsVolumeDetailsMap , err := utils .QueryVolumeDetailsUtil (ctx , c .manager .VolumeManager , volumeIds )
2503+ if err != nil {
2504+ return nil , err
2505+ }
2506+ if _ , ok := cnsVolumeDetailsMap [volumeID ]; ! ok {
2507+ return nil , logger .LogNewErrorCodef (log , codes .Internal ,
2508+ "cns query volume did not return the volume: %s" , volumeID )
2509+ }
2510+ snapshotSizeInMB := cnsVolumeDetailsMap [volumeID ].SizeInMB
25202511 snapshotCreateTimeInProto := timestamppb .New (cnsSnapshotInfo .SnapshotLatestOperationCompleteTime )
25212512 createSnapshotResponse := & csi.CreateSnapshotResponse {
25222513 Snapshot : & csi.Snapshot {
@@ -2708,11 +2699,7 @@ func (c *controller) ControllerExpandVolume(ctx context.Context, req *csi.Contro
27082699 // Later we may need to define different csi faults.
27092700 // Check if the volume contains CNS snapshots only for block volumes.
27102701 if cnsVolumeType == common .UnknownVolumeType {
2711- cnsVolumeType , err = common .GetCnsVolumeType (ctx , c .manager .VolumeManager , req .VolumeId )
2712- if err != nil {
2713- return nil , csifault .CSIInternalFault , logger .LogNewErrorCodef (log , codes .Internal ,
2714- "failed to determine CNS volume type for volume: %q. Error: %+v" , req .VolumeId , err )
2715- }
2702+ cnsVolumeType = common .GetCnsVolumeType (ctx , req .VolumeId )
27162703 volumeType = convertCnsVolumeType (ctx , cnsVolumeType )
27172704 }
27182705 if cnsVolumeType == common .BlockVolumeType &&
0 commit comments