ADR 0276: merges are assembled in a rolling window, and each batch is delivered by one walk (issue 362) #271

Merged
mesh-admin merged 1 commits from decisions/0276-merges-are-assembled-in-a-rolling-window into main 2026-10-10 10:44:53 +00:00
Contributor

Issue 362 (two merges seconds apart left their delivery waiting for a person).

The operator's decision, recorded as accepted (deciders jochen, quoted in the record):

  • A rolling merge window: each merge restarts it; it closes after 90 s without a merge (merge-window) and at the latest 10 min after the batch's first merge (merge-window-at-most). Kept in the controller's store.
  • A batch is planned once, as one walk with at most one commit per repository: for a repository merged twice, the later commit, which contains the earlier; the earlier merge ends covered when the walk is delivered. A failed walk marks nothing delivered and walks the earlier merges alone, newest first, to find the culprit (the operator chose this over splitting).
  • One walk at a time; merges arriving during a walk join the next batch; a started walk is never superseded; only a walk still waiting for its word is folded into the next one.
  • A delivery group's order (ADR 0249, unchanged) becomes tier edges inside a walk.
  • The controller owns the window (it plans its own path without mesh-delivery); mesh-delivery keeps each commit's record and the word.
  • The bookkeeping is repaired too: a walk names every merge it answers, is never tied to an ended delivery, and every wait has a bound and a condition.
  • plans shows the assembling batch: what it holds, how long is left, plan not yet calculated.

Also: superseded-in-part notes on ADR 0162, 0218, 0238, 0239; to-be 47 and 10 amended; glossary gains merge window and batch; issue 362 gets amended-design: and a corrected account of the S16 warning, which was raised at 00:51 but said there was nothing to do.

The issue stays located until the code lands (mesh-controller, mesh-catalog, and mesh-lab replay R362).

Issue 362 (two merges seconds apart left their delivery waiting for a person). The operator's decision, recorded as accepted (deciders jochen, quoted in the record): - A rolling merge window: each merge restarts it; it closes after 90 s without a merge (`merge-window`) and at the latest 10 min after the batch's first merge (`merge-window-at-most`). Kept in the controller's store. - A batch is planned once, as one walk with at most one commit per repository: for a repository merged twice, the later commit, which contains the earlier; the earlier merge ends `covered` when the walk is delivered. A failed walk marks nothing delivered and walks the earlier merges alone, newest first, to find the culprit (the operator chose this over splitting). - One walk at a time; merges arriving during a walk join the next batch; a started walk is never superseded; only a walk still waiting for its word is folded into the next one. - A delivery group's order (ADR 0249, unchanged) becomes tier edges inside a walk. - The controller owns the window (it plans its own path without mesh-delivery); mesh-delivery keeps each commit's record and the word. - The bookkeeping is repaired too: a walk names every merge it answers, is never tied to an ended delivery, and every wait has a bound and a condition. - `plans` shows the assembling batch: what it holds, how long is left, plan not yet calculated. Also: superseded-in-part notes on ADR 0162, 0218, 0238, 0239; to-be 47 and 10 amended; glossary gains *merge window* and *batch*; issue 362 gets `amended-design:` and a corrected account of the S16 warning, which was raised at 00:51 but said there was nothing to do. The issue stays `located` until the code lands (mesh-controller, mesh-catalog, and mesh-lab replay R362).
mesh-admin added 1 commit 2026-10-10 10:39:26 +00:00
ADR 0276: merges are assembled in a rolling window, and each batch is delivered by one walk
mesh/merge-gate pass: the change touches no module of the mesh's graph
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered
d159bfa36a
Two catalogue merges 18 s apart opened two walks; the second superseded the
first and nothing gave it its word for 58 minutes (issue 362). The operator
decided that merges are collected in a rolling merge window (90 s, at most
10 min) and each batch is walked once, one commit per repository (the later
one of a repository, which contains the earlier), one walk at a time; the
walk-to-delivery bookkeeping is repaired too and every wait has a condition.
Amends to-be 47 and 10, adds merge window and batch to the glossary, and
corrects the issue's account of the S16 condition.
Author
Contributor

Delivery novox/hq@d159bfa36a77 — delivered since 2026-10-10T10:45:05Z

Delivery plan — builds nothing: the change touches no module of the mesh's graph

Transitions

  • 2026-10-10 10:39 (new) → proposed (announced): novox/hq#271's head announced
  • 2026-10-10 10:40 proposed → checked (checked): the verdict names this commit
  • 2026-10-10 10:40 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-10 10:45 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-10 10:45 published → delivered (done): nothing for a walk to move

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/hq@d159bfa36a77` — **delivered** since 2026-10-10T10:45:05Z **Delivery plan** — builds nothing: the change touches no module of the mesh's graph **Transitions** - 2026-10-10 10:39 (new) → proposed (announced): novox/hq#271's head announced - 2026-10-10 10:40 proposed → checked (checked): the verdict names this commit - 2026-10-10 10:40 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-10 10:45 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-10 10:45 published → delivered (done): nothing for a walk to move The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
mesh-admin merged commit 2798306de7 into main 2026-10-10 10:44:53 +00:00
mesh-admin deleted branch decisions/0276-merges-are-assembled-in-a-rolling-window 2026-10-10 10:44:54 +00:00
Sign in to join this conversation.
No Reviewers
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/hq#271