mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-20 15:04:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add fallback to volume info and backup/restore describe

Browse Source 
Signed-off-by: Lyndon-Li <lyonghui@vmware.com>
This commit is contained in:
Lyndon-Li
2026-09-10 18:22:35 +08:00
parent 8db945a6fd
commit 6b3e7ef5dd
16 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apis/velero/v1/pod_volume_backup_types.go
+1 -1
View File
@@ -142,7 +142,7 @@ type PodVolumeBackupStatus struct {
// +nullable
AcceptedTimestamp *metav1.Time `json:"acceptedTimestamp,omitempty"`
// FallbackFull indicates whether the incremental backup fallbacks to full backup
// FallbackFull indicates whether the incremental backup has fallen back to full backup
FallbackFull bool `json:"fallbackFull,omitempty"`
}
pkg/apis/velero/v1/pod_volume_restore_type.go
+1 -1
View File
@@ -125,7 +125,7 @@ type PodVolumeRestoreStatus struct {
// +optional
Node string `json:"node,omitempty"`
// FallbackFull indicates whether the incremental restore fallbacks to full restore
// FallbackFull indicates whether the incremental restore has fallen back to full restore
FallbackFull bool `json:"fallbackFull,omitempty"`
}
pkg/apis/velero/v2alpha1/data_download_types.go
+1 -1
View File
@@ -150,7 +150,7 @@ type DataDownloadStatus struct {
// +nullable
AcceptedTimestamp *metav1.Time `json:"acceptedTimestamp,omitempty"`
// FallbackFull indicates whether the incremental restore fallbacks to full restore
// FallbackFull indicates whether the incremental restore has fallen back to full restore
FallbackFull bool `json:"fallbackFull,omitempty"`
}
pkg/apis/velero/v2alpha1/data_upload_types.go
+1 -1
View File
@@ -199,7 +199,7 @@ type DataUploadStatus struct {
// +nullable
AcceptedTimestamp *metav1.Time `json:"acceptedTimestamp,omitempty"`
// FallbackFull indicates whether the incremental backup fallbacks to full backup
// FallbackFull indicates whether the incremental backup has fallen back to full backup
FallbackFull bool `json:"fallbackFull,omitempty"`
}
pkg/datamover/backup_micro_service_test.go
+1 -1
View File
@@ -152,7 +152,7 @@ func TestOnDataUploadCompleted(t *testing.T) {
{
name: "marshal fail",
marshalErr: errors.New("fake-marshal-error"),
expectedErr: "Failed to marshal backup result { false { } 0 <nil> 0}: fake-marshal-error",
expectedErr: "Failed to marshal backup result { false { } 0 <nil> 0 false}: fake-marshal-error",
},
{
name: "succeed",
pkg/datamover/restore_micro_service_test.go
+1 -1
View File
@@ -102,7 +102,7 @@ func TestOnDataDownloadCompleted(t *testing.T) {
{
name: "marshal fail",
marshalErr: errors.New("fake-marshal-error"),
expectedErr: "Failed to marshal restore result {{ } 0 0}: fake-marshal-error",
expectedErr: "Failed to marshal restore result {{ } 0 0 false}: fake-marshal-error",
},
{
name: "succeed",
pkg/podvolume/backup_micro_service_test.go
+1 -1
View File
@@ -156,7 +156,7 @@ func TestOnDataPathCompleted(t *testing.T) {
{
name: "marshal fail",
marshalErr: errors.New("fake-marshal-error"),
expectedErr: "Failed to marshal backup result { false { } 0 <nil> 0}: fake-marshal-error",
expectedErr: "Failed to marshal backup result { false { } 0 <nil> 0 false}: fake-marshal-error",
},
{
name: "succeed",
pkg/podvolume/restore_micro_service_test.go
+1 -1
View File
@@ -165,7 +165,7 @@ func TestOnPvrCompleted(t *testing.T) {
{
name: "marshal fail",
marshalErr: errors.New("fake-marshal-error"),
expectedErr: "error marshaling restore result {{ } 0 0}: fake-marshal-error",
expectedErr: "error marshaling restore result {{ } 0 0 false}: fake-marshal-error",
},
{
name: "succeed",
pkg/uploader/block/snapshot.go
+8 -2
View File
@@ -128,7 +128,10 @@ func snapshotSource(
log.WithError(err).Warnf("Failed to create CBT with source %v", cbtSource)
}
fallback := (len(bitmap.Errors()) > 0)
fallback := false
if !forceFull {
fallback = (len(bitmap.Errors()) > 0)
}
snap, backupSize, err := u.Backup(source, parentBackup.parentObject, bitmap.Iterator(), uploaderCfg)
if err != nil {
@@ -251,7 +254,10 @@ func Restore(ctx context.Context, blkUp Uploader, rep udmrepo.BackupRepo, snapsh
bitmap.SetFull()
}
fallback := (len(bitmap.Errors()) > 0)
fallback := false
if incremental {
fallback = (len(bitmap.Errors()) > 0)
}
destPath, err := filepath.Abs(dest)
if err != nil {
pkg/uploader/block/snapshot_test.go
+30 -3
View File
@@ -31,6 +31,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
"k8s.io/utils/ptr"
"github.com/vmware-tanzu/velero/pkg/cbtservice"
cbtservicemocks "github.com/vmware-tanzu/velero/pkg/cbtservice/mocks"
@@ -126,6 +127,7 @@ func TestBackup(t *testing.T) {
assert.Equal(t, int64(8), info.IncrementalSize)
assert.Equal(t, int64(2048), info.SnapshotSize)
assert.Equal(t, int64(len("test-block-data")), info.SourceSize)
assert.False(t, info.Fallback)
},
},
{
@@ -149,6 +151,7 @@ func TestBackup(t *testing.T) {
assert.Equal(t, int64(8), info.IncrementalSize)
assert.Equal(t, int64(len("test-block-data")), info.SnapshotSize)
assert.Equal(t, int64(len("test-block-data")), info.SourceSize)
assert.False(t, info.Fallback)
},
},
}
@@ -210,6 +213,8 @@ func TestSnapshotSource(t *testing.T) {
testCases := []struct {
name string
forceFull *bool
parentSnapshot string
setupMocks func(blkup *mockUploader, repo *udmrepomocks.BackupRepo)
expectedErrStr string
expectedSnapID string
@@ -260,7 +265,7 @@ func TestSnapshotSource(t *testing.T) {
expectedSnapID: "snap-success",
expectedSize: 512,
expectedSnapshotSize: 2048,
expectedFallback: true,
expectedFallback: false,
},
{
name: "tags from cbtSource and snapshotTags are merged onto snapshot",
@@ -278,7 +283,7 @@ func TestSnapshotSource(t *testing.T) {
expectedSnapID: "snap-tags",
expectedSize: 256,
expectedSnapshotSize: 4096,
expectedFallback: true,
expectedFallback: false,
},
{
name: "success with cbtService getting allocated blocks",
@@ -322,6 +327,23 @@ func TestSnapshotSource(t *testing.T) {
expectedSnapID: "snap-cbt-fallback",
expectedSize: 1024,
expectedSnapshotSize: 1024,
expectedFallback: false,
},
{
name: "incremental backup falls back to full when parent snapshot load fails",
forceFull: ptr.To(false),
parentSnapshot: "snap-parent",
setupMocks: func(blkup *mockUploader, repo *udmrepomocks.BackupRepo) {
repo.On("GetSnapshot", mock.Anything, udmrepo.ID("snap-parent")).
Return(udmrepo.Snapshot{}, errors.New("parent not found"))
blkup.On("Backup", mock.Anything, udmrepo.ID(""), mock.Anything, mock.Anything).
Return(udmrepo.Snapshot{TotalSize: 1024}, int64(1024), nil)
repo.On("SaveSnapshot", mock.Anything, mock.Anything).Return(udmrepo.ID("snap-inc-fallback"), nil)
repo.On("Flush", mock.Anything).Return(nil)
},
expectedSnapID: "snap-inc-fallback",
expectedSize: 1024,
expectedSnapshotSize: 1024,
expectedFallback: true,
},
}
@@ -342,10 +364,15 @@ func TestSnapshotSource(t *testing.T) {
cbtSvc = tc.cbtService(t)
}
forceFull := true
if tc.forceFull != nil {
forceFull = *tc.forceFull
}
snapID, size, snapshotSize, fallback, err := snapshotSource(
ctx, mockRepo, mockBlkup,
baseSource,
true, "",
forceFull, tc.parentSnapshot,
cbtSrc, cbtSvc,
snapshotTags, map[string]string{},
testLog(), "Block Uploader",