check related to block size

Signed-off-by: shravani <[email protected]>

Author: shravaniphadolibm

driver/csiplugin/controllerserver.go

@@ -73,9 +73,14 @@ type ScaleControllerServer struct {
 
 func (cs *ScaleControllerServer) IfSameVolReqInProcess(scVol *scaleVolume, requestedSize int64) (bool, error) {
 	capacity, volpresent := cs.Driver.reqmap[scVol.VolName]
+
 	if volpresent {
 		/*  #nosec G115 -- false positive  */
+<<<<<<< Updated upstream
 		if capacity == requestedSize {
+=======
+		if int64(scVol.VolSize) == capacity {
+>>>>>>> Stashed changes
 			return true, nil
 		} else {
 			return false, status.Error(codes.Internal, fmt.Sprintf("Volume %v present in map but requested size %v does not match with size %v in map", scVol.VolName, scVol.VolSize, capacity))
@@ -269,6 +274,7 @@ func (cs *ScaleControllerServer) setQuota(ctx context.Context, scVol *scaleVolum
 	}
 
 	filesetQuotaBytes, err := ConvertToBytes(quota)
+
 	if err != nil {
 		if strings.Contains(err.Error(), "invalid number specified") {
 			// Invalid number specified means quota is not set
@@ -278,6 +284,21 @@ func (cs *ScaleControllerServer) setQuota(ctx context.Context, scVol *scaleVolum
 		}
 	}
 
+<<<<<<< Updated upstream
+=======
+	// changing volsize here for pvc size in decimal units to align with scale block size
+	// filesystemName := scVol.VolBackendFs
+	// klog.Info("Filesystemname", filesystemName)
+	// filesystemDetails, err := scVol.Connector.GetFilesystemDetails(ctx, filesystemName)
+	// if err != nil {
+	// 	klog.Errorf("Unable to get the filesystemdetails")
+	// }
+	// klog.Info("filesystem details", filesystemDetails)
+	// blockInfo := filesystemDetails.Block.BlockSize
+	// roundedBlock := uint64(math.Floor(float64(scVol.VolSize) / float64(blockInfo)))
+	// scVol.VolSize = roundedBlock * uint64(blockInfo)
+
+>>>>>>> Stashed changes
 	if filesetQuotaBytes != scVol.VolSize {
 		var hardLimit, softLimit string
 		hardLimit = strconv.FormatUint(scVol.VolSize, 10)
@@ -664,6 +685,8 @@ func (cs *ScaleControllerServer) createFilesetVol(ctx context.Context, scVol *sc
 		}
 	}
 	targetBasePath := ""
+	// changing the quota
+
 	if !isCGIndependentFset {
 		if scVol.VolSize != 0 {
 			err = cs.setQuota(ctx, scVol, volName)
@@ -726,7 +749,8 @@ func handleUpdateComment(ctx context.Context, scVol *scaleVolume, setAfmAttribut
 
 func (cs *ScaleControllerServer) getVolumeSizeInBytes(req *csi.CreateVolumeRequest) int64 {
 	capacity := req.GetCapacityRange()
-	return capacity.GetRequiredBytes()
+	requiredBytes := capacity.GetRequiredBytes()
+	return requiredBytes
 }
 
 func updateComment(ctx context.Context, scVol *scaleVolume, setAfmAttributes bool, afmTuningParams map[string]interface{}) error {
@@ -905,7 +929,6 @@ func (cs *ScaleControllerServer) CreateVolume(newctx context.Context, req *csi.C
 
 	/* Get volume size in bytes */
 	volSize := cs.getVolumeSizeInBytes(req)
-
 	reqCapabilities := req.GetVolumeCapabilities()
 	if reqCapabilities == nil {
 		return nil, status.Error(codes.InvalidArgument, "Volume Capabilities is a required field")
@@ -1095,7 +1118,12 @@ func (cs *ScaleControllerServer) CreateVolume(newctx context.Context, req *csi.C
 
 		return &csi.CreateVolumeResponse{
 			Volume: &csi.Volume{
+<<<<<<< Updated upstream
 				VolumeId:      volID,
+=======
+				VolumeId: volID,
+				//CapacityBytes: int64(scaleVol.VolSize), // #nosec G115 -- false positive
+>>>>>>> Stashed changes
 				CapacityBytes: req.GetCapacityRange().GetRequiredBytes(), // #nosec G115 -- false positive
 				VolumeContext: req.GetParameters(),
 				ContentSource: volSrc,
@@ -1178,7 +1206,24 @@ func (cs *ScaleControllerServer) CreateVolume(newctx context.Context, req *csi.C
 		if capRange == nil {
 			return nil, status.Error(codes.InvalidArgument, "volume range is not provided")
 		}
+<<<<<<< Updated upstream
+		capacity := uint64(capRange.GetRequiredBytes()) // #nosec G115 -- false positive
+=======
+
+		// changing capacity here for pvc size in decimal units to align with scale block size
 		capacity := uint64(capRange.GetRequiredBytes()) // #nosec G115 -- false positive
+		// filesystemName := scaleVol.VolBackendFs
+		// filesystemDetails, err := scaleVol.Connector.GetFilesystemDetails(ctx, filesystemName)
+		// if err != nil {
+		// 	klog.Errorf("[%s] Create Volume - unable to get filesystem details ", err)
+		// 	return nil, status.Error(codes.Internal, fmt.Sprintf("CreateVolume - unable to get filesystem details for Filesystem", err))
+		// }
+		// blockinfo := filesystemDetails.Block.BlockSize
+		// roundedblock := uint64(math.Floor(float64(capacity) / float64(blockinfo)))
+		// capacity = roundedblock * uint64(blockinfo)
+		// klog.Info("new capacity", capacity)
+
+>>>>>>> Stashed changes
 		targetPath, err = cs.createStaticBasedVol(ctx, scaleVol, filesetName, capacity)
 	} else if scaleVol.IsFilesetBased {
 		targetPath, err = cs.createFilesetBasedVol(ctx, scaleVol, isCGVolume, volFsInfo.Type, req.Secrets, afmTuningParams, gatewayNodeName)
@@ -1232,7 +1277,12 @@ func (cs *ScaleControllerServer) CreateVolume(newctx context.Context, req *csi.C
 
 	return &csi.CreateVolumeResponse{
 		Volume: &csi.Volume{
+<<<<<<< Updated upstream
 			VolumeId:      volID,
+=======
+			VolumeId: volID,
+			//CapacityBytes: int64(scaleVol.VolSize) // #nosec G115 -- false positive
+>>>>>>> Stashed changes
 			CapacityBytes: req.GetCapacityRange().GetRequiredBytes(), // #nosec G115 -- false positive
 			VolumeContext: req.GetParameters(),
 			ContentSource: volSrc,
@@ -1374,9 +1424,15 @@ func (cs *ScaleControllerServer) setScaleVolume(ctx context.Context, req *csi.Cr
 	//getting the filesystemname
 	filesystemName := scaleVol.VolBackendFs
 	klog.Info("Filesystemname", filesystemName)
+<<<<<<< Updated upstream
 	filesystemDetails, err := cs.Driver.connmap["primary"].GetFilesystemDetails(ctx, filesystemName)
 	if err != nil {
 		klog.Errorf("%s Unable to get the filesystemdetails for Filesystem %s. Error: %v", utils.GetLoggerId(ctx), filesystemName, err)
+=======
+	filesystemDetails, err := scaleVol.Connector.GetFilesystemDetails(ctx, filesystemName)
+	if err != nil {
+		klog.Errorf("Unable to get the filesystemdetails")
+>>>>>>> Stashed changes
 		return nil, false, "", status.Error(codes.Internal, fmt.Sprintf("unable to get filesystem details for Filesystem %s. Error: %v", filesystemName, err))
 	}
 	klog.V(4).Infof("[%s] filesystemDetails: %+v", utils.GetLoggerId(ctx), filesystemDetails)
@@ -1394,6 +1450,7 @@ func (cs *ScaleControllerServer) setScaleVolume(ctx context.Context, req *csi.Cr
 		scaleVol.VolSize = smallestVolSize
 	} else {
 		scaleVol.VolSize = uint64(volSize) // #nosec G115 -- false positive
+
 	}
 
 	/* Get details for Primary Cluster */