From 1777bbe5b4a1e970bf06c9cd05295f6c79dcf440 Mon Sep 17 00:00:00 2001 From: Xun Jiang/Bruce Jiang <59276555+blackpiglet@users.noreply.github.com> Date: Fri, 4 Aug 2023 18:09:21 +0800 Subject: [PATCH] Add warning log for snapshot data mover fell backup to Velero native snapshot. (#6602) Enlarge throttle of UT case TestThrottle_ShouldOutput to avoid occasional CI failure due to timeout caused by test environment's CPU speed Signed-off-by: Xun Jiang --- pkg/backup/item_backupper.go | 5 +++++ pkg/uploader/kopia/progress_test.go | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/backup/item_backupper.go b/pkg/backup/item_backupper.go index 4c1ba94e7d..f1cafbfcad 100644 --- a/pkg/backup/item_backupper.go +++ b/pkg/backup/item_backupper.go @@ -525,6 +525,11 @@ func (ib *itemBackupper) takePVSnapshot(obj runtime.Unstructured, log logrus.Fie // After that, this warning can be removed. if boolptr.IsSetToTrue(ib.backupRequest.Spec.SnapshotMoveData) { log.Warnf("VolumeSnapshotter plugin doesn't support data movement.") + + if features.IsEnabled(velerov1api.CSIFeatureFlag) && pv.Spec.CSI == nil { + log.Warn("Cannot use CSI data mover to handle PV, because PV doesn't contain CSI in spec.", + " Fall back to Velero native snapshot.") + } } if ib.backupRequest.ResPolicies != nil { diff --git a/pkg/uploader/kopia/progress_test.go b/pkg/uploader/kopia/progress_test.go index 7b349cbe14..2d17dd65e6 100644 --- a/pkg/uploader/kopia/progress_test.go +++ b/pkg/uploader/kopia/progress_test.go @@ -37,7 +37,7 @@ func TestThrottle_ShouldOutput(t *testing.T) { expectedOutput bool }{ {interval: time.Second, expectedOutput: true}, - {interval: time.Second, throttle: time.Now().UnixNano() + int64(time.Nanosecond*10000), expectedOutput: false}, + {interval: time.Second, throttle: time.Now().UnixNano() + int64(time.Nanosecond*100000000), expectedOutput: false}, } p := new(Progress) for _, tc := range testCases {