*: adjust message type

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

cmd/backup-manager/app/util/backup_size.go

@@ -202,11 +202,7 @@ func calculateSnapshotSize(volumeId, snapshotId string) (uint64, uint64, error)
 
 	start := time.Now()
 
-<<<<<<< HEAD
 	klog.Infof("start to calculate snapshot size for %s, volume id %s",
-=======
-	klog.Infof("start to calculate snapshot size for %s, base on snapshot %s, volume id %s",
->>>>>>> 7bd164825 (ebs br: add retry support for ListSnapshotBlocks() and ListChangedBlocks())
 		snapshotId, volumeId)
 
 	ebsSession, err := util.NewEBSSession(util.CloudAPIConcurrency)
@@ -251,7 +247,7 @@ func calculateSnapshotSize(volumeId, snapshotId string) (uint64, uint64, error)
 		}
 
 		isRetry := func(err error) bool {
-			klog.V(4).Infof("calc snapshot size hit error %s", err.Error())
+			klog.Warningf("calc snapshot size hit error %s", err.Error())
 			return !strings.Contains(err.Error(), "RequestThrottledException")
 		}
 		err = retry.OnError(backoff, isRetry, listBlocks)
@@ -333,7 +329,7 @@ func calculateChangedBlocksSize(volumeId, preSnapshotId, snapshotId string) (uin
 		}
 
 		isRetry := func(err error) bool {
-			klog.V(4).Infof("calc snapshot size hit error %s", err.Error())
+			klog.Warningf("calc snapshot size hit error %s", err.Error())
 			return !strings.Contains(err.Error(), "RequestThrottledException")
 		}
 		err = retry.OnError(backoff, isRetry, listChangeBlocks)
@@ -351,10 +347,7 @@ func calculateChangedBlocksSize(volumeId, preSnapshotId, snapshotId string) (uin
 
 	klog.Infof("incremental snapshot size %s, num of api ListChangedBlocks request %d, snapshot id %s, volume id %s, takes %v",
 		humanize.Bytes(snapshotSize), numApiReq, snapshotId, volumeId, elapsed)
-<<<<<<< HEAD
 
-=======
->>>>>>> 7bd164825 (ebs br: add retry support for ListSnapshotBlocks() and ListChangedBlocks())
 	return snapshotSize, numApiReq, nil
 }