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

Merge pull request #1389 from skriss/restore-partially-failed

Browse Source 
Add PartiallyFailed phase for restores
This commit is contained in:
Nolan Brubaker
2019-04-25 17:06:26 -04:00
committed by GitHub
parent f2b4e73e2e c201a2c103
commit bf19623e82
6 changed files with 47 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/restore_controller.go
View File

@@ -259,6 +259,10 @@ func (c *restoreController) processRestore(restore *api.Restore) error {
restore.Status.Phase = api.RestorePhaseFailed
restore.Status.FailureReason = err.Error()
c.metrics.RegisterRestoreFailed(backupScheduleName)
} else if restore.Status.Errors > 0 {
c.logger.Debug("Restore partially failed")
restore.Status.Phase = api.RestorePhasePartiallyFailed
c.metrics.RegisterRestorePartialFailure(backupScheduleName)
} else {
c.logger.Debug("Restore completed")
restore.Status.Phase = api.RestorePhaseCompleted

3
pkg/controller/restore_controller_test.go
View File

@@ -300,6 +300,7 @@ func TestProcessQueueItem(t *testing.T) {
restorerError: errors.New("blarg"),
expectedErr: false,
expectedPhase: string(api.RestorePhaseInProgress),
expectedFinalPhase: string(api.RestorePhasePartiallyFailed),
expectedRestoreErrors: 1,
expectedRestorerCall: NewRestore("foo", "bar", "backup-1", "ns-1", "", api.RestorePhaseInProgress).Restore,
},
@@ -595,7 +596,7 @@ func TestProcessQueueItem(t *testing.T) {
if test.expectedFinalPhase != "" {
expected = Patch{
Status: StatusPatch{
Phase: api.RestorePhaseCompleted,
Phase: api.RestorePhase(test.expectedFinalPhase),
Errors: test.expectedRestoreErrors,
},
}