fix(promote): preserve recorded component state on finalize and defer cleanup until after commit#595
Merged
Conversation
…er rejoin cleanup until state is durable Signed-off-by: Joshua Temple <joshua.temple@stablekernel.com>
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.
Component-scoped promote finalize never lifted the component's recorded per-env state, so a component promotion rebuilt the env leaf from nil and whole-leaf-replaced state.components.. - silently LOSING the deploy-history ring, sibling deploy rows (promoting only one app dropped the others), ref/base_sha/patches, and the divergence fields (so rejoin lifecycle cleanup never ran and leaked the integration branch). Monorepo data-loss on the promote/finalize path.
Fix: the component lift now runs in NewFinalizerWithKey via a key-aware overlayComponentState, seeding state.components.. into the flat map before updateState mutates it, so the recorded leaf carries forward. Single-component and concurrent-sibling 409 CAS semantics are unchanged. Also defers the rejoin lifecycle cleanup (persistAndCleanup: Run -> CommitAndPush -> cleanup) so a failed trunk commit deletes nothing.
Verification: build/-race/lint green, 2970 tests; red-then-green unit tests (leaf carry-forward, rejoin-from-divergence, cleanup-deferred, no-cleanup-on-failed-commit) plus e2e scenario 51 asserting a second component promote preserves the prior ring with the sibling untouched. No generated output changed.