fix(dataprotection): preserve OneToOne source Pod identity during scale-out restore - #10836
Merged
leon-ape merged 1 commit intoSep 1, 2026
Merged
Conversation
Collaborator
|
Auto Cherry-pick Instructions CLA Recheck Instructions |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## release-1.1 #10836 +/- ##
===============================================
+ Coverage 55.57% 55.63% +0.06%
===============================================
Files 550 550
Lines 62332 62421 +89
===============================================
+ Hits 34639 34727 +88
+ Misses 24388 24380 -8
- Partials 3305 3314 +9
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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.
Backport of #10826 for
release-1.1. Related to #10828.Problem
Scale-out creates one Restore per new Pod. The Restore currently replaces the actual Pod ordinal with the start of its instance-template range, and DP later treats
BackupStatusTarget.SelectedTargetPodsas an ordinal-indexed array. Kubernetes list order does not provide that contract, so reversed lists, ordinal holes, and multiple templates sharing the same ordinal can select the wrong source Pod or produce an empty restore.What changed
RestoreManager.SourceTargetNameis a prepareData/scale-out override.Release adaptation
This is an independent
release-1.1port rather than an automatic cherry-pick because the restore manager, tests, and Ops source-target support differ from main.Validation
Passed with the repository test wrapper (using the current generated mock overlay because the release branch's generated mock file is incomplete):
./pkg/controller/instancetemplate./pkg/dataprotection/restore./pkg/controller/plan./pkg/operationsgit diff --check