vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7762 from kaovilai/waitBackupRepoErrsVerbose 

Surface errors when waiting for backupRepository
pull/7592/head
lyndon-li 2024-05-17 10:03:19 +08:00 committed by GitHub
parent a0b7382e5a 2c6853b6e8
commit 65a831ed67
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelogs/unreleased/7762-kaovilai Normal file
View File

@ -0,0 +1 @@
Surface errors when waiting for backupRepository and timeout occurs

9
pkg/repository/ensurer.go
View File

@ -117,12 +117,14 @@ func (r *Ensurer) createBackupRepositoryAndWait(ctx context.Context, namespace s
func (r *Ensurer) waitBackupRepository(ctx context.Context, namespace string, backupRepoKey BackupRepositoryKey) (*velerov1api.BackupRepository, error) {
var repo *velerov1api.BackupRepository
var checkErr error
checkFunc := func(ctx context.Context) (bool, error) {
found, err := GetBackupRepository(ctx, r.repoClient, namespace, backupRepoKey, true)
if err == nil {
repo = found
return true, nil
} else if isBackupRepositoryNotFoundError(err) || isBackupRepositoryNotProvisionedError(err) {
checkErr = err
return false, nil
} else {
return false, err
@ -131,7 +133,12 @@ func (r *Ensurer) waitBackupRepository(ctx context.Context, namespace string, ba
err := wait.PollUntilContextTimeout(ctx, time.Millisecond*500, r.resourceTimeout, true, checkFunc)
if err != nil {
return nil, errors.Wrap(err, "failed to wait BackupRepository")
if err == context.DeadlineExceeded {
// if deadline is exceeded, return the error from the last check instead of the wait error
return nil, errors.Wrap(checkErr, "failed to wait BackupRepository, timeout exceeded")
}
// if the error is not deadline exceeded, return the error from the wait
return nil, errors.Wrap(err, "failed to wait BackupRepository, errored early")
}
return repo, nil

8
pkg/repository/ensurer_test.go
View File

@ -102,7 +102,7 @@ func TestEnsureRepo(t *testing.T) {
bkRepoObjNotReady,
},
runtimeScheme: scheme,
err: "failed to wait BackupRepository: context deadline exceeded",
err: "failed to wait BackupRepository, timeout exceeded: backup repository not provisioned",
},
{
name: "create fail",
@ -110,7 +110,7 @@ func TestEnsureRepo(t *testing.T) {
bsl: "fake-bsl",
repositoryType: "fake-repo-type",
runtimeScheme: scheme,
err: "failed to wait BackupRepository: context deadline exceeded",
err: "failed to wait BackupRepository, timeout exceeded: backup repository not provisioned",
},
}
@ -175,7 +175,7 @@ func TestCreateBackupRepositoryAndWait(t *testing.T) {
bkRepoObj,
},
runtimeScheme: scheme,
err: "failed to wait BackupRepository: more than one BackupRepository found for workload namespace \"fake-ns\", backup storage location \"fake-bsl\", repository type \"fake-repo-type\"",
err: "failed to wait BackupRepository, errored early: more than one BackupRepository found for workload namespace \"fake-ns\", backup storage location \"fake-bsl\", repository type \"fake-repo-type\"",
},
{
name: "wait repo fail",
@ -183,7 +183,7 @@ func TestCreateBackupRepositoryAndWait(t *testing.T) {
bsl: "fake-bsl",
repositoryType: "fake-repo-type",
runtimeScheme: scheme,
err: "failed to wait BackupRepository: context deadline exceeded",
err: "failed to wait BackupRepository, timeout exceeded: backup repository not provisioned",
},
}