refactor(#3034): rename PostSwap to RebuildBookkeeping
It reads as a swap thing but is post-*rebuild* bookkeeping: rev marker, forge and matrix sync, manager kick, container rescan, meta-inputs snapshot. Wire label follows (`post_swap` -> `rebuild_bookkeeping`); the graph view renders whatever label it is sent, so nothing keys on the old string. Also corrects a doc the previous commit falsified: this node's comment still said it declares the agent lease as a re-entrant borrow, after that declaration moved to the brace. Clippy and the whole suite pass over a stale doc comment, so it took reading the file to find. Verified by grepping the new name for places it has no business being, which caught the sed rewriting a *historical* test name in a `// Replaces ...` comment - reverted, since prose about the past must keep its old spelling.
This commit is contained in:
parent
31a1853a45
commit
a0790e4e49
5 changed files with 56 additions and 38 deletions
|
|
@ -22,7 +22,7 @@
|
|||
//! shape says "this subtree is coordinated, one holder speaks for it".
|
||||
//!
|
||||
//! ```text
|
||||
//! rebuild(a): MetaSync(a) → AgentWindow(a){ Prebuild(a) → StopForUpdate(a) → Swap(a) →(ok) PostSwap(a) } →(any) Reconcile(a)
|
||||
//! rebuild(a): MetaSync(a) → AgentWindow(a){ Prebuild(a) → StopForUpdate(a) → Swap(a) →(ok) RebuildBookkeeping(a) } →(any) Reconcile(a)
|
||||
//! rebuild(a) graceful: … AgentWindow(a){ Prebuild(a) ∥ Signal(a) → Drain(a); both →(ok) StopForUpdate(a) → … } [boot sweep only]
|
||||
//! spawn(a): Provision(a) → Create(a) → WriteDropin(a) → Reconcile(a) [wanted=Up at approve]
|
||||
//! perm-change(a): WritePermFile(a) → «rebuild subgraph»
|
||||
|
|
@ -149,7 +149,7 @@ pub(crate) struct RebuildRoots<'a> {
|
|||
pub meta_sync: Handle<'a>,
|
||||
/// The brace holding the agent lease and the build slot — its roll-up
|
||||
/// carries the whole mechanical subtree (`Prebuild`, the quiesce chain,
|
||||
/// `StopForUpdate` → `Swap` → `PostSwap`).
|
||||
/// `StopForUpdate` → `Swap` → `RebuildBookkeeping`).
|
||||
pub agent_window: Handle<'a>,
|
||||
/// The recovery/convergence tail root.
|
||||
pub reconcile: Handle<'a>,
|
||||
|
|
@ -186,7 +186,7 @@ impl<'a> RebuildRoots<'a> {
|
|||
/// `Drain`. Waiting on the build is deliberate — running the drain window
|
||||
/// early is the win, taking the container *down* early would be pure
|
||||
/// downtime. This is the node that actually stops the container.
|
||||
/// - `Swap` (child of `StopForUpdate`), then `PostSwap` (`AfterOk` its sibling
|
||||
/// - `Swap` (child of `StopForUpdate`), then `RebuildBookkeeping` (`AfterOk` its sibling
|
||||
/// `Swap`): the Ok-only bookkeeping tail (rev marker, forge/matrix sync,
|
||||
/// kick, rescan).
|
||||
/// - `Reconcile` (**last, root**): `AfterAny` `AgentWindow`, which rolls up
|
||||
|
|
@ -260,8 +260,8 @@ fn rebuild_subtree<'a>(
|
|||
let swap = builder
|
||||
.node(NodeKind::Swap { agent: a() })
|
||||
.part_of(stop_for_update);
|
||||
let _post_swap = builder
|
||||
.node(NodeKind::PostSwap { agent: a() })
|
||||
let _rebuild_bookkeeping = builder
|
||||
.node(NodeKind::RebuildBookkeeping { agent: a() })
|
||||
.part_of(stop_for_update)
|
||||
.after_ok(swap);
|
||||
|
||||
|
|
@ -317,7 +317,7 @@ pub(crate) fn graceful_rebuild_nodes<'a>(
|
|||
/// `FinalizeDeploy` waits on **two** roots, which together reproduce the gate
|
||||
/// the old fused node had around its inline `rebuild_no_meta` call:
|
||||
/// - `AfterOk` `Prebuild` — a parent's state is its roll-up, so this is `Done`
|
||||
/// only once `StopForUpdate` → `Swap` → `PostSwap` all are (a failed *or*
|
||||
/// only once `StopForUpdate` → `Swap` → `RebuildBookkeeping` all are (a failed *or*
|
||||
/// cancelled child rolls the parent up `Failed`). That's the old
|
||||
/// `build_result`.
|
||||
/// - `AfterOk` `Reconcile` — the old call passed `deferred_start = false` on
|
||||
|
|
@ -350,7 +350,7 @@ pub(crate) fn deploy_rebuild_nodes(builder: &JobBuilder, agent: &str, approval_i
|
|||
///
|
||||
/// Closed by an [`NodeKind::EmitRebuilt`] tail edged onto all three group-roots
|
||||
/// (`MetaSync`, `Prebuild`, `Reconcile`) — `Prebuild`'s roll-up carries the
|
||||
/// whole `StopForUpdate`→`Swap`→`PostSwap` subtree, so those three cover every
|
||||
/// whole `StopForUpdate`→`Swap`→`RebuildBookkeeping` subtree, so those three cover every
|
||||
/// node. Edging `Reconcile` alone would not do: it is `AfterAny` `Prebuild`, so
|
||||
/// it reaches `Done` even after a failed swap and the tail would report success.
|
||||
pub fn rebuild(builder: &JobBuilder, agent: &str, relock: bool) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue