Reject restores from backups not in a completed or partially failed phase#9792
Merged
Conversation
Signed-off-by: subhramit <subhramit.bb@live.in>
Signed-off-by: subhramit <subhramit.bb@live.in>
Signed-off-by: subhramit <subhramit.bb@live.in>
Signed-off-by: Subhramit Basu <subhramit.bb@live.in>
subhramit
changed the title
subhramit
changed the title
sseago
previously approved these changes
May 19, 2026
Contributor
Author
|
@sseago @Lyndon-Li hey, could I get an approval for the awaiting CI workflows? |
👷 Deploy request for velero pending review.Visit the deploys page to approve it
|
3 tasks
kaovilai
previously approved these changes
Jun 2, 2026
There was a problem hiding this comment.
Pull request overview
This PR tightens restore validation to ensure a Restore cannot start from a Backup that is not yet usable (or is being deleted), addressing the race described in issue #9790.
Changes:
- Add restore validation to only allow source backups in
CompletedorPartiallyFailedphase. - Update restore workflow documentation to describe the new validation requirement.
- Extend restore controller tests with coverage for allowed/disallowed backup phases and adjust some existing tests to set backup phase explicitly.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
site/content/docs/main/restore-reference.md |
Documents that restore validation requires the referenced backup to be in a usable phase (Completed/PartiallyFailed). |
pkg/controller/restore_controller.go |
Enforces backup phase validation during restore admission/validation. |
pkg/controller/restore_controller_test.go |
Adds/updates test cases for the new validation logic (but still needs further updates for consistency). |
changelogs/unreleased/9792-subhramit |
Adds an unreleased changelog note for the new restore validation behavior. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
305
to
309
| name: "restorer throwing an error causes the restore to fail", | ||
| location: defaultStorageLocation, | ||
| restore: NewRestore("foo", "bar", "backup-1", "ns-1", "", velerov1api.RestorePhaseNew).Result(), | ||
| backup: defaultBackup().StorageLocation("default").Result(), | ||
| backup: defaultBackup().StorageLocation("default").Phase(velerov1api.BackupPhaseCompleted).Result(), | ||
| restorerError: errors.New("blarg"), |
Contributor
Author
There was a problem hiding this comment.
Since all the tests are passing, have to verify the merit of copilot's suggestion. Will take a look soon.
Contributor
Author
There was a problem hiding this comment.
3 tasks
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
subhramit
commented
Jun 2, 2026
Signed-off-by: Subhramit Basu <subhramit.bb@live.in>
kaovilai
approved these changes
Jun 2, 2026
Joeavaikath
approved these changes
Jun 4, 2026
Contributor
Author
Member
|
this repo require 2 maintainer approvals :) Need another not me to go in. |
sseago
approved these changes
Jun 8, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reject restores from backups not in a completed or partially failed phase.
Fixes #9790
Please indicate you've done the following:
make new-changelog) or comment/kind changelog-not-requiredon this PR.site/content/docs/main.