fix(orchestrate): overlay recorded component state before reading and finalizing#596
Merged
Merged
Conversation
…tate map Signed-off-by: Joshua Temple <joshua.temple@stablekernel.com> (cherry picked from commit 78171c20fabccd73c17cdd1b53329993bd8beb48)
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
1 participant
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.
Orchestrate read and wrote component state without first lifting the recorded per-component per-env leaf (unlike the promote/preflight paths). Effect on a component-scoped manifest: the base-SHA ladder collapsed to HEAD~1 on every component run, and Finalize rebuilt the env leaf from empty, clobbering the deploy-history ring, sibling deploy rows, ref/base_sha/patches, and divergence fields.
Fix: a new shared config.OverlayComponentState helper (beside ReadComponentState) is invoked in NewOrchestrator after options apply, seeding state.components.. into the flat map so the ladder resolves off recorded state and Finalize carries the leaf forward. The non-component (flat) path is unchanged (overlay is a no-op when component is empty).
Verification: build/-race/lint green, full suite; red-then-green tests for the leaf lift, the no-change re-dispatch ladder anchor, and a real Finalize preserving the sibling deploy/ring/divergence, plus config helper tests. No generated output changed. Follow-up: unify this helper with the promote path's overlayComponentState.