mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-07 13:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5314 from allenxu404/issue3565

Browse Source 
Change the status of restore to completed from partiallyFailed when restore empty backup
This commit is contained in:
Xun Jiang/Bruce Jiang
2022-09-16 15:00:36 +08:00
committed by GitHub
parent 1e138af1cf dc70471909
commit 4768c2acf4
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/5314-allenxu404 Normal file
View File

@@ -0,0 +1 @@
Change the status of restore to completed from partially failed when restore empty backup

6
pkg/restore/restore.go
View File

@@ -408,6 +408,12 @@ func (ctx *restoreContext) execute() (Result, Result) {
ctx.restoreDir = dir
backupResources, err := archive.NewParser(ctx.log, ctx.fileSystem).Parse(ctx.restoreDir)
// If ErrNotExist occurs, it implies that the backup to be restored includes zero items.
// Need to add a warning about it and jump out of the function.
if errors.Cause(err) == archive.ErrNotExist {
warnings.AddVeleroError(errors.Wrap(err, "zero items to be restored"))
return warnings, errs
}
if err != nil {
errs.AddVeleroError(errors.Wrap(err, "error parsing backup contents"))
return warnings, errs

36
pkg/restore/restore_test.go
View File

@@ -762,14 +762,15 @@ func TestInvalidTarballContents(t *testing.T) {
tarball io.Reader
want map[*test.APIResource][]string
wantErrs Result
wantWarnings Result
}{
{
name: "empty tarball returns an error",
name: "empty tarball returns a warning",
restore: defaultRestore().Result(),
backup: defaultBackup().Result(),
tarball: test.NewTarWriter(t).
Done(),
wantErrs: Result{
wantWarnings: Result{
Velero: []string{archive.ErrNotExist.Error()},
},
},
@@ -820,33 +821,32 @@ func TestInvalidTarballContents(t *testing.T) {
nil, // snapshot location lister
nil, // volume snapshotter getter
)
assertEmptyResults(t, warnings)
assertWantErrs(t, tc.wantErrs, errs)
assertWantErrsOrWarnings(t, tc.wantWarnings, warnings)
assertWantErrsOrWarnings(t, tc.wantErrs, errs)
assertAPIContents(t, h, tc.want)
})
}
}
func assertWantErrs(t *testing.T, wantErrRes Result, errRes Result) {
func assertWantErrsOrWarnings(t *testing.T, wantRes Result, res Result) {
t.Helper()
if wantErrRes.Velero != nil {
assert.Equal(t, len(wantErrRes.Velero), len(errRes.Velero))
for i := range errRes.Velero {
assert.Contains(t, errRes.Velero[i], wantErrRes.Velero[i])
if wantRes.Velero != nil {
assert.Equal(t, len(wantRes.Velero), len(res.Velero))
for i := range res.Velero {
assert.Contains(t, res.Velero[i], wantRes.Velero[i])
}
}
if wantErrRes.Namespaces != nil {
assert.Equal(t, len(wantErrRes.Namespaces), len(errRes.Namespaces))
for ns := range errRes.Namespaces {
assert.Equal(t, len(wantErrRes.Namespaces[ns]), len(errRes.Namespaces[ns]))
for i := range errRes.Namespaces[ns] {
assert.Contains(t, errRes.Namespaces[ns][i], wantErrRes.Namespaces[ns][i])
if wantRes.Namespaces != nil {
assert.Equal(t, len(wantRes.Namespaces), len(res.Namespaces))
for ns := range res.Namespaces {
assert.Equal(t, len(wantRes.Namespaces[ns]), len(res.Namespaces[ns]))
for i := range res.Namespaces[ns] {
assert.Contains(t, res.Namespaces[ns][i], wantRes.Namespaces[ns][i])
}
}
}
if wantErrRes.Cluster != nil {
assert.Equal(t, wantErrRes.Cluster, errRes.Cluster)
if wantRes.Cluster != nil {
assert.Equal(t, wantRes.Cluster, res.Cluster)
}
}