No merge is dropped, and the merge window lives on the bus (issues 973 step 2, 921) #367

Merged

mesh-tools merged 12 commits from feat/merge-window-on-the-bus into main

2026-10-17 10:54:05 +00:00

Author	SHA1	Message	Date
jschoubben	bafc31bf85	The ssh-client test offers every key ssh-client's files ask of forge-account, read from them (issue 985) mesh/merge-gate head bafc31bf8568 merged into trunk b0d489a86c23 — pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus… Details mesh/repo-check head bafc31bf8568 merged into trunk b0d489a86c23 — pass: its merge-check.sh passed Details mesh/delivery delivered Details	2026-10-17 12:43:21 +02:00
jschoubben	fbf5a3f909	The held-merges integration test waits for the batch's window to close, as a joined batch's window opens again (issue 921)	2026-10-17 12:42:30 +02:00
jschoubben	20e14872ef	Make the merges consumer before the events consumer narrows, from the old one's ack floor, so no merge is lost to the change (issue 973) mesh/merge-gate head 20e14872ef1e merged into trunk b0d489a86c23 — pass: builds build-agent, mesh-controller, route-proxy → ace, g14, novox, shanks; no bus… Details mesh/repo-check head 20e14872ef1e merged into trunk b0d489a86c23 — fail: its merge-check.sh failed: --- FAIL: TestSSHClientOwnsTheOperatorsSSHConfig (0.07s… Details mesh/delivery superseded: a newer head of the same pull request Details	2026-10-17 12:33:18 +02:00
jschoubben	5702187695	Leave a merge unsettled whenever the controller's context ended, whatever the error (issue 921)	2026-10-17 12:30:49 +02:00
jschoubben	a79182e53b	Give the forge's merges a durable consumer of their own: no max-deliver, no reset, a growing delay while held (issue 973)	2026-10-17 12:28:27 +02:00
jschoubben	ff16938096	Leave a held merge unsettled when the controller ends or the hold fails, never take it (issue 921)	2026-10-17 12:20:40 +02:00
jschoubben	e3f22c737f	Round a merge window key's time to live up to a whole second, as the server rounds down (issue 973)	2026-10-17 12:20:24 +02:00
jschoubben	2b99d455fc	Integration test of the merge path on a test bus: a held merge is recorded and carried, a window closes by its key's expiry (issues 921, 973)	2026-10-17 12:14:43 +02:00
jschoubben	9e99f31c23	Remove the five-minute merge catch-up, its signal S5 and its watchdog: the event and its durable consumer keep every merge (issue 973)	2026-10-17 12:12:19 +02:00
jschoubben	df39a499ef	Close a batch's merge window by the expiry of a key on the bus, heard by a watcher, and drop the five-second cutter (issue 973)	2026-10-17 12:10:30 +02:00
jschoubben	11725908ec	The merge window's bucket: keys that expire, written by the controller (issue 973)	2026-10-17 12:07:57 +02:00
jschoubben	379a52c2e8	Hold a merge the controller cannot record now, and hand it over again, instead of taking it (issue 921)	2026-10-17 12:03:00 +02:00