Deliver a merge whose walk said its modules matched what runs, instead of stopping it as stranded (hq issue 611) #265

Merged
mesh-admin merged 1 commits from fix/611-an-unchanged-build-is-delivered into main 2026-10-13 08:25:47 +00:00
Contributor

after: novox/mesh-controller#295

What: mesh-delivery reads the walk's delivery.unchanged, which mesh-controller#295 writes. A module of the delivery's plan that the walk said unchanged counts as answered. A published delivery whose walk ended before its word, having built or said unchanged every module of its plan, is delivered. If it built none and said all of them unchanged, it is delivered whichever commit the walk carried, because its merge moves nothing (ADR 0270 §1). Its why names the modules that matched what runs. A module the walk neither built nor said unchanged still strands the delivery and stops it after the grace (issue 474), naming only that module. A record from a controller that does not say the field reads as before.

Why: #293's walk moved nothing because build-agent's and route-proxy's build sources held none of its files. The stranded rule stopped it and asked the operator about a change already on every machine.

Tests: TestAMergeWhoseModulesMatchWhatRunsIsDelivered (#293's replay: delivered, a success status, nothing stalled past the grace), TestAMergeWithAModuleNeitherBuiltNorUnchangedIsStillStopped, TestAMergeWhoseWalkSaysNothingUnchangedIsStillStopped, and TestABatchedMergeWhoseModuleMatchesWhatRunsIsDelivered (issue 474's batch shape). With only the field added to main, the delivered and partly-unchanged tests fail. MESH_CHECK_MODULES=mesh-delivery sh merge-check.sh passed with MESH_GATE built from mesh-controller main.

Fixes issue 611.

after: novox/mesh-controller#295 What: mesh-delivery reads the walk's `delivery.unchanged`, which mesh-controller#295 writes. A module of the delivery's plan that the walk said unchanged counts as answered. A published delivery whose walk ended before its word, having built or said unchanged every module of its plan, is `delivered`. If it built none and said all of them unchanged, it is delivered whichever commit the walk carried, because its merge moves nothing (ADR 0270 §1). Its why names the modules that matched what runs. A module the walk neither built nor said unchanged still strands the delivery and stops it after the grace (issue 474), naming only that module. A record from a controller that does not say the field reads as before. Why: #293's walk moved nothing because build-agent's and route-proxy's build sources held none of its files. The stranded rule stopped it and asked the operator about a change already on every machine. Tests: `TestAMergeWhoseModulesMatchWhatRunsIsDelivered` (#293's replay: delivered, a success status, nothing stalled past the grace), `TestAMergeWithAModuleNeitherBuiltNorUnchangedIsStillStopped`, `TestAMergeWhoseWalkSaysNothingUnchangedIsStillStopped`, and `TestABatchedMergeWhoseModuleMatchesWhatRunsIsDelivered` (issue 474's batch shape). With only the field added to main, the delivered and partly-unchanged tests fail. `MESH_CHECK_MODULES=mesh-delivery sh merge-check.sh` passed with MESH_GATE built from mesh-controller main. Fixes issue 611.
mesh-admin added 1 commit 2026-10-13 06:21:23 +00:00
Deliver a merge whose walk said its modules matched what runs, instead of stopping it as stranded (hq issue 611)
mesh/merge-gate head 2f5e97030a5c merged into trunk bc3b59227f46 — pass: builds mesh-delivery → novox; no bus step; every machine composes with the change …
mesh/repo-check head 2f5e97030a5c merged into trunk bc3b59227f46 — pass: its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-…
mesh/delivery delivered
mesh/delivery-group group fix/611-an-unchanged-build-is-delivered merged: every member is merged
2f5e97030a
A walk that moved nothing because every module's recorded build source held none of the changed files now
says so per module (delivery.unchanged). Such a merge moves nothing (ADR 0270 §1): it is delivered, naming
the modules, not stopped 20 minutes later with the operator asked about a change already on every machine.
A module the walk neither built nor said unchanged still stops it (issue 474).
Author
Contributor

Delivery novox/mesh-catalog@2f5e97030a5c — delivered since 2026-10-13T08:40:14Z

Delivery plan — builds mesh-delivery → novox; no bus step

  • tier 0: mesh-delivery
  • novox: receives mesh-delivery

Group fix/611-an-unchanged-build-is-delivered, in order: novox/hq@18a5b2ac1a → novox/mesh-controller@05576db018 → novox/mesh-catalog@2f5e97030a

Machines

  • mesh-controller on novox: passed — healthy 3 times over 4m7s
  • mesh-controller on the rest running it: sent
  • build-agent on g14: passed — healthy 1 times over 43s
  • build-agent on the rest running it: sent
  • mesh-delivery on novox: passed — healthy 3 times over 2m15s
  • mesh-delivery on the rest running it: sent

Transitions

  • 2026-10-13 06:21 (new) → proposed (announced): novox/mesh-catalog#265's head announced
  • 2026-10-13 06:24 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit
  • 2026-10-13 06:24 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-13 08:27 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-13 08:27 published → delivering (go): its walk started: let go by this owner in its group's order, by a person, or on the controller's own path — not a failed walk that carried a later commit for it, after which it waits for a walk of its own commit
  • 2026-10-13 08:40 delivering → delivered (done): its walk is done, carrying its own commit: every machine of its deploy plan passed, or was left as its policy says

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

<!-- mesh-delivery:view --> **Delivery** `novox/mesh-catalog@2f5e97030a5c` — **delivered** since 2026-10-13T08:40:14Z **Delivery plan** — builds mesh-delivery → novox; no bus step - tier 0: mesh-delivery - novox: receives mesh-delivery **Group** `fix/611-an-unchanged-build-is-delivered`, in order: novox/hq@18a5b2ac1a48 → novox/mesh-controller@05576db018a4 → novox/mesh-catalog@2f5e97030a5c - novox/mesh-controller@05576db018a4 before novox/mesh-catalog@2f5e97030a5c: built by - composed together: pass — every machine composes with the change as it did without (4 of 4 compose) **Machines** - mesh-controller on novox: passed — healthy 3 times over 4m7s - mesh-controller on the rest running it: sent - build-agent on g14: passed — healthy 1 times over 43s - build-agent on the rest running it: sent - mesh-delivery on novox: passed — healthy 3 times over 2m15s - mesh-delivery on the rest running it: sent **Transitions** - 2026-10-13 06:21 (new) → proposed (announced): novox/mesh-catalog#265's head announced - 2026-10-13 06:24 proposed → checked (checked): a verdict names this commit and the trunk's head as its trunk commit - 2026-10-13 06:24 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-13 08:27 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-13 08:27 published → delivering (go): its walk started: let go by this owner in its group's order, by a person, or on the controller's own path — not a failed walk that carried a later commit for it, after which it waits for a walk of its own commit - 2026-10-13 08:40 delivering → delivered (done): its walk is done, carrying its own commit: every machine of its deploy plan passed, or was left as its policy says The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
Author
Contributor

Merge check at 2f5e9703
Judged: head 2f5e97030a5c merged into trunk bc3b59227f46; read beside it: mesh-controller cd6757f1e3c8, mesh-controller-main a688dcff394b, mesh-host 7a41e120635b, mesh-tools 954e1a53eef9

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery)
  • mesh/repo-check: PASS — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)

Delivery plan — builds mesh-delivery → novox; no bus step

  • tier 0: mesh-delivery
  • novox: receives mesh-delivery
  • read by no module's build: modules/mesh-delivery/cmd/mesh-delivery/issue611_test.go

Run by the build seat on g14 as build-1791872504687563926 (builds --log build-1791872504687563926).

--- the gate: mesh-delivery
mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups
long-running resources without health: 0
files asking for a setting without saying whether it is trusted: 0
1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here
judging 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-13T06:00:44Z says they run
composing every machine as the mesh is
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
composing every machine with the change
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued
merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose)
judged by controller development build against the facts of 2026-10-13T06:00:44Z

machines:
  - a machine (f35): composes
  - holds mesh-dns-resolver (idt): composes
  - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes
  - a machine (yvbpsm): composes

a merge would rebuild 1 module(s) in 1 tier(s): mesh-delivery

notes:
  - modules/mesh-delivery/cmd/mesh-delivery/issue611_test.go read by no module's build, and rebuild nothing (issue 280)
--- its merge-check.sh (go toolchain)
ok  	git.novox.be/novox/mesh-catalog/checks/words	0.003s
words: 12 retired words and 70 daemons' lines, none in the 46108 strings of 712 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.009s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/secrets	0.010s
secrets: no setting can replace a vault secret in a mergeable file (1 known, nested)
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.005s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 67, as kept
ok  	git.novox.be/novox/mesh-catalog/checks/deps	0.193s
testing modules/mesh-delivery
ok  	mesh-delivery/cmd/mesh-delivery	2.851s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `2f5e9703` Judged: head `2f5e97030a5c` merged into trunk `bc3b59227f46`; read beside it: mesh-controller `cd6757f1e3c8`, mesh-controller-main `a688dcff394b`, mesh-host `7a41e120635b`, mesh-tools `954e1a53eef9` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: mesh-delivery) - `mesh/repo-check`: **PASS** — its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript) **Delivery plan** — builds mesh-delivery → novox; no bus step - tier 0: mesh-delivery - novox: receives mesh-delivery - read by no module's build: modules/mesh-delivery/cmd/mesh-delivery/issue611_test.go Run by the build seat on g14 as `build-1791872504687563926` (`builds --log build-1791872504687563926`). ``` --- the gate: mesh-delivery mesh-delivery: ok, 1 tool(s), invokes seat:mesh-controller.delivery-plan, seat:mesh-controller.delivery-order, seat:mesh-controller.delivery-check, seat:mesh-controller.deliver, seat:mesh-controller.delivery-stop, seat:mesh-controller.delivery-walks, gitea.gitea_note_append, gitea.gitea_delivery_view, gitea.gitea_commit_status, gitea.gitea_commit_statuses, gitea.gitea_contains, gitea.gitea_open_pulls, keeps state deliveries, groups long-running resources without health: 0 files asking for a setting without saying whether it is trusted: 0 1 manifest(s) checked. Judged against the seats this binary carries; a claim on one of the mesh's own seats is judged fully at registration, and a seat declared by a module not given here reads as unknown. Identities judged on a 6-character machine name, against the bounds of the providers given here judging 0 module(s) changed against 4 machine(s), as the snapshot of 2026-10-13T06:00:44Z says they run composing every machine as the mesh is the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued composing every machine with the change the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued the bus's user list leaves out 5 user(s) the mesh has minted no credential for: controller, node.f35, node.idt, node.ygcyr, node.yvbpsm. Each is a user that cannot connect until one is issued merge gate: PASS — every machine composes with the change as it did without (4 of 4 compose) judged by controller development build against the facts of 2026-10-13T06:00:44Z machines: - a machine (f35): composes - holds mesh-dns-resolver (idt): composes - holds git, holds mesh-artifact-store, holds mesh-broker, holds mesh-catalog, holds mesh-delivery, holds mesh-dns-resolver, holds mesh-store, holds mesh-vault, holds npm-package-registry, the control node, the hub (ygcyr): composes - a machine (yvbpsm): composes a merge would rebuild 1 module(s) in 1 tier(s): mesh-delivery notes: - modules/mesh-delivery/cmd/mesh-delivery/issue611_test.go read by no module's build, and rebuild nothing (issue 280) --- its merge-check.sh (go toolchain) ok git.novox.be/novox/mesh-catalog/checks/words 0.003s words: 12 retired words and 70 daemons' lines, none in the 46108 strings of 712 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.009s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/secrets 0.010s secrets: no setting can replace a vault secret in a mergeable file (1 known, nested) ok git.novox.be/novox/mesh-catalog/checks/paths 0.005s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 67, as kept ok git.novox.be/novox/mesh-catalog/checks/deps 0.193s testing modules/mesh-delivery ok mesh-delivery/cmd/mesh-delivery 2.851s --- its merge-check-typescript.sh (typescript toolchain) ```
mesh-admin left a comment
Author
Contributor

Verdict: approve at 2f5e97030a

No blocking findings.

The case issue 474 exists for still stops. A walk that ended without building and says no module unchanged leaves notMovedBy non-empty, so walkMovedItsModules reads false and strand stops the delivery 20 minutes after the walk ended, as on main. TestAMergeWhoseWalkSaysNothingUnchangedIsStillStopped proves this for #293's shape, and the existing issue 474 tests (among them TestAMergeWhoseBatchWalkEndedAndNothingCoversItIsStoppedSayingWhy and TestAMergeWhoseBatchWalkEndedWaitsForALaterMergeOnItsWay) pass at the head. A walk that says one module unchanged and leaves the other unbuilt also still stops, naming only the unbuilt module (TestAMergeWithAModuleNeitherBuiltNorUnchangedIsStillStopped).

The tests fail on main. Copied onto main as they stand, they do not compile, because WalkDelivery has no Unchanged field. With only that field added to main's model, so that main reads the record but does nothing with it, TestAMergeWhoseModulesMatchWhatRunsIsDelivered and TestABatchedMergeWhoseModuleMatchesWhatRunsIsDelivered fail with the delivery left published, "waiting for a later delivered merge to carry build-agent, route-proxy". TestAMergeWithAModuleNeitherBuiltNorUnchangedIsStillStopped fails because main names both modules in the stop. At the head, go vet ./... is clean, and go test -race -count=1 ./... passes for modules/mesh-delivery.

Rollback and ordering are safe. The module decodes nothing with DisallowUnknownFields, Unchanged is omitempty on WalkDelivery and on WalkSeen, and a nil map reads as no module unchanged. A mesh-delivery running before the controller that writes the field behaves exactly as main does. If mesh-delivery is rolled back to main, a delivery already delivered stays final, and a new walk that says unchanged is stranded as before, which is today's behaviour rather than a new fault.

Non-blocking: issue 474's own live case (#215, a Makefile change that is not in build-agent's recorded build source) would now read delivered, saying build-agent matched what runs, rather than covered by #219. That follows ADR 0270 decision 1 and ADR 0267, and I think it is the right reading, but it changes what that replay would say.

Non-blocking: when the walk carried a later commit and built some of the planned modules while saying the rest unchanged, the Done row refuses it (carriedLater and not builtNoneOfIts) and the covered row takes it, saying "covered" with the carrier. That is correct. hq #340's sentence "A delivery whose every module the walk built or said unchanged is delivered" does not describe this mixed case, and I have noted that on hq #340.

Statuses at the head: mesh/merge-gate success ("head 2f5e97030a merged into trunk bc3b59227f — pass: builds mesh-delivery → novox; no bus step; every machine composes with the change …"), mesh/repo-check success ("pass: its merge-check.sh passed, each part in its toolchain"), mesh/delivery success ("ready: it delivers once merged"), and mesh/delivery-group pending ("group fix/611-an-unchanged-build-is-delivered checking: 0 of 3 member(s) ready"). The group must pass for every head before any member merges.

Verdict: approve at 2f5e97030a5cfe5b0406a748d12913a929e5ea23 No blocking findings. The case issue 474 exists for still stops. A walk that ended without building and says no module unchanged leaves notMovedBy non-empty, so walkMovedItsModules reads false and strand stops the delivery 20 minutes after the walk ended, as on main. TestAMergeWhoseWalkSaysNothingUnchangedIsStillStopped proves this for #293's shape, and the existing issue 474 tests (among them TestAMergeWhoseBatchWalkEndedAndNothingCoversItIsStoppedSayingWhy and TestAMergeWhoseBatchWalkEndedWaitsForALaterMergeOnItsWay) pass at the head. A walk that says one module unchanged and leaves the other unbuilt also still stops, naming only the unbuilt module (TestAMergeWithAModuleNeitherBuiltNorUnchangedIsStillStopped). The tests fail on main. Copied onto main as they stand, they do not compile, because WalkDelivery has no Unchanged field. With only that field added to main's model, so that main reads the record but does nothing with it, TestAMergeWhoseModulesMatchWhatRunsIsDelivered and TestABatchedMergeWhoseModuleMatchesWhatRunsIsDelivered fail with the delivery left published, "waiting for a later delivered merge to carry build-agent, route-proxy". TestAMergeWithAModuleNeitherBuiltNorUnchangedIsStillStopped fails because main names both modules in the stop. At the head, go vet ./... is clean, and go test -race -count=1 ./... passes for modules/mesh-delivery. Rollback and ordering are safe. The module decodes nothing with DisallowUnknownFields, Unchanged is omitempty on WalkDelivery and on WalkSeen, and a nil map reads as no module unchanged. A mesh-delivery running before the controller that writes the field behaves exactly as main does. If mesh-delivery is rolled back to main, a delivery already delivered stays final, and a new walk that says unchanged is stranded as before, which is today's behaviour rather than a new fault. Non-blocking: issue 474's own live case (#215, a Makefile change that is not in build-agent's recorded build source) would now read delivered, saying build-agent matched what runs, rather than covered by #219. That follows ADR 0270 decision 1 and ADR 0267, and I think it is the right reading, but it changes what that replay would say. Non-blocking: when the walk carried a later commit and built some of the planned modules while saying the rest unchanged, the Done row refuses it (carriedLater and not builtNoneOfIts) and the covered row takes it, saying "covered" with the carrier. That is correct. hq #340's sentence "A delivery whose every module the walk built or said unchanged is delivered" does not describe this mixed case, and I have noted that on hq #340. Statuses at the head: mesh/merge-gate success ("head 2f5e97030a5c merged into trunk bc3b59227f46 — pass: builds mesh-delivery → novox; no bus step; every machine composes with the change …"), mesh/repo-check success ("pass: its merge-check.sh passed, each part in its toolchain"), mesh/delivery success ("ready: it delivers once merged"), and mesh/delivery-group pending ("group fix/611-an-unchanged-build-is-delivered checking: 0 of 3 member(s) ready"). The group must pass for every head before any member merges.
mesh-admin merged commit 5cd608ba88 into main 2026-10-13 08:25:47 +00:00
mesh-admin deleted branch fix/611-an-unchanged-build-is-delivered 2026-10-13 08:25:47 +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/mesh-catalog#265