changing IfSameVolReqInProcess function, adding check if blocksize is 0

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

Author: shravaniphadolibm

driver/csiplugin/controllerserver.go

@@ -71,11 +71,11 @@ type ScaleControllerServer struct {
 	csi.UnimplementedControllerServer
 }
 
-func (cs *ScaleControllerServer) IfSameVolReqInProcess(scVol *scaleVolume) (bool, error) {
+func (cs *ScaleControllerServer) IfSameVolReqInProcess(scVol *scaleVolume, requestedSize int64) (bool, error) {
 	capacity, volpresent := cs.Driver.reqmap[scVol.VolName]
 	if volpresent {
 		/*  #nosec G115 -- false positive  */
-		if capacity == int64(scVol.VolSize) {
+		if capacity == requestedSize {
 			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))
@@ -1117,8 +1117,7 @@ func (cs *ScaleControllerServer) CreateVolume(newctx context.Context, req *csi.C
 		}
 
 	}
-
-	volReqInProcess, err := cs.IfSameVolReqInProcess(scaleVol)
+	volReqInProcess, err := cs.IfSameVolReqInProcess(scaleVol, req.GetCapacityRange().GetRequiredBytes()) //volReqInProcess, err := cs.IfSameVolReqInProcess(scaleVol,blockInfo)
 	if err != nil {
 		return nil, err
 	}
@@ -1127,6 +1126,9 @@ func (cs *ScaleControllerServer) CreateVolume(newctx context.Context, req *csi.C
 		klog.Errorf("[%s] volume:[%v] - volume creation already in process ", loggerId, scaleVol.VolName)
 		return nil, status.Error(codes.Aborted, fmt.Sprintf("volume creation already in process : %v", scaleVol.VolName))
 	}
+	// This is to simulate a delay in volume creation to test IfSameVolReqInProcess
+	klog.Infof("[%s] Simulating a delay of 4 minutes to test IfSameVolReqInProcess", loggerId)
+	time.Sleep(4 * time.Minute)
 
 	volResponse, err := cs.getCopyJobStatus(ctx, req, volSrc, scaleVol, isVolSource, isSnapSource, snapIdMembers)
 	if err != nil {