docker: log rotation is a preference, 100m × 10 by default, judged before daemon.json takes it (hq issue 452) #205

Merged
mesh-admin merged 1 commits from fix/452-log-rotation-is-a-preference into main 2026-10-11 10:21:53 +00:00
Contributor

Fixes novox/hq issue 452 as the operator decided (note 2): default max-size 100m and max-file 10 on every machine; taken at the container runtime's next start, no restart forced; the size a number with k, m or g, the count 1 to 99, refused before daemon.json is written.

What changes

  • Two preferences (ADR 0262): log-max-size (default 100m) and log-max-file (default 10). Both terminal-only ("trusted": true).
  • daemon (into-json, ADR 0102) now also writes "log-driver": "json-file" (every machine's driver today) and "log-opts": {"max-size", "max-file"}.
  • How a bad value is refused. The controller has no setting types yet (issue 346) and pastes a value as text; dockerd is daemon.json's only reader and reads log-opts only at start, so a bad size would surface as a runtime that does not start, and a quote could add any key. The manifest supports no value pattern, so the module validates in its own program: the same two values go into ${dir:state}/log-rotation.conf (0600), and a run-once step log-rotation-check (./docker-tools check-log-rotation, root, the tools bundle, as forticlient's split-dns runs its bundle) judges them. It is declared before daemon; a failed step skips the rest of the module (ADR 0136), so daemon.json keeps what it had and the apply's report names the setting. It re-runs when log-rotation changes.
  • runtime is unchanged: reload-on daemon, no restart-on. A reload (SIGHUP) takes neither log key and stops no container.

Per machine

machine daemon.json anything restarted?
ace unchanged: it already holds json-file, 100m, 10 by hand; the host records them as the machine's (given back as they are if the module goes) nothing; no reload, since the file does not change
g14 gains log-driver and log-opts docker.service reloaded (as for any daemon change today); no restart; no container stops
novox gains log-driver and log-opts the same: reloaded, not restarted
shanks gains log-driver and log-opts the same: reloaded, not restarted

On every machine: the module's state directory with log-rotation.conf, and the step's oneshot unit docker-log-rotation-check.service, run once (and again only when the values change). On g14, novox and shanks the rotation holds from the runtime's next start (a boot), and only for containers created after it; a container keeps its log options until it is created again. docker_daemon_config shows the keys as pending meanwhile.

Tests

logrotation_test.go, written first. Against main (with an accept-everything stub of the parser so it compiles) the manifest tests failed for the right reason: log-driver is <nil>, want json-file, log-opts is <nil>, no log-rotation file or log-rotation-check step, and every bad value accepted. Now: defaults give exactly "log-driver":"json-file", "log-opts":{"max-size":"100m","max-file":"10"}; refused: 100, 10x, 0m, -1, 10M, 1.5m, a quote, an injected key, a value bringing a second line, count 0, 100, -1, 01, 3.0; accepted: 100m/10, 512k/1, 2g/99, 50m/3; the step is declared before daemon and the runtime has no restart-on.

merge-check.sh with MESH_GATE = a controller built from mesh-controller main and MESH_CHECK_CHANGED=modules/docker/module.json: words clean, agent-home clean, paths clean, module check ok, long-running resources without health 69 as kept, docker tests pass. Nothing installed, no container started.

Not verified: the composed declaration itself (no offline compose); the order and filling follow the controller's declared-order composition and the forticlient/route-adapter precedents.

Issue: novox/hq 452. Do not merge without an independent review.

Fixes novox/hq issue 452 as the operator decided (note 2): default `max-size` 100m and `max-file` 10 on every machine; taken at the container runtime's next start, no restart forced; the size a number with k, m or g, the count 1 to 99, refused before daemon.json is written. ## What changes - Two preferences (ADR 0262): `log-max-size` (default `100m`) and `log-max-file` (default `10`). Both terminal-only (`"trusted": true`). - `daemon` (into-json, ADR 0102) now also writes `"log-driver": "json-file"` (every machine's driver today) and `"log-opts": {"max-size", "max-file"}`. - **How a bad value is refused.** The controller has no setting types yet (issue 346) and pastes a value as text; dockerd is daemon.json's only reader and reads log-opts only at start, so a bad size would surface as a runtime that does not start, and a quote could add any key. The manifest supports no value pattern, so the module validates in its own program: the same two values go into `${dir:state}/log-rotation.conf` (0600), and a run-once step `log-rotation-check` (`./docker-tools check-log-rotation`, root, the tools bundle, as forticlient's split-dns runs its bundle) judges them. It is declared before `daemon`; a failed step skips the rest of the module (ADR 0136), so daemon.json keeps what it had and the apply's report names the setting. It re-runs when `log-rotation` changes. - `runtime` is unchanged: reload-on `daemon`, no restart-on. A reload (SIGHUP) takes neither log key and stops no container. ## Per machine | machine | daemon.json | anything restarted? | |---|---|---| | ace | unchanged: it already holds json-file, 100m, 10 by hand; the host records them as the machine's (given back as they are if the module goes) | nothing; no reload, since the file does not change | | g14 | gains `log-driver` and `log-opts` | docker.service reloaded (as for any daemon change today); no restart; no container stops | | novox | gains `log-driver` and `log-opts` | the same: reloaded, not restarted | | shanks | gains `log-driver` and `log-opts` | the same: reloaded, not restarted | On every machine: the module's state directory with `log-rotation.conf`, and the step's oneshot unit `docker-log-rotation-check.service`, run once (and again only when the values change). On g14, novox and shanks the rotation holds from the runtime's next start (a boot), and only for containers created after it; a container keeps its log options until it is created again. `docker_daemon_config` shows the keys as pending meanwhile. ## Tests `logrotation_test.go`, written first. Against main (with an accept-everything stub of the parser so it compiles) the manifest tests failed for the right reason: `log-driver is <nil>, want json-file`, `log-opts is <nil>`, `no log-rotation file or log-rotation-check step`, and every bad value accepted. Now: defaults give exactly `"log-driver":"json-file"`, `"log-opts":{"max-size":"100m","max-file":"10"}`; refused: `100`, `10x`, `0m`, `-1`, `10M`, `1.5m`, a quote, an injected key, a value bringing a second line, count `0`, `100`, `-1`, `01`, `3.0`; accepted: `100m`/`10`, `512k`/`1`, `2g`/`99`, `50m`/`3`; the step is declared before `daemon` and the runtime has no restart-on. `merge-check.sh` with `MESH_GATE` = a controller built from mesh-controller main and `MESH_CHECK_CHANGED=modules/docker/module.json`: words clean, agent-home clean, paths clean, module check ok, long-running resources without health 69 as kept, docker tests pass. Nothing installed, no container started. Not verified: the composed declaration itself (no offline compose); the order and filling follow the controller's declared-order composition and the forticlient/route-adapter precedents. Issue: novox/hq 452. Do not merge without an independent review.
mesh-admin added 1 commit 2026-10-11 02:43:39 +00:00
docker: make log rotation a preference, 100m x 10 by default, judged by a step before daemon.json takes it (novox/hq issue 452)
mesh/repo-check pass: its merge-check.sh passed, each part in its toolchain: merge-check.sh (go), merge-check-typescript.sh (typescript)
mesh/merge-gate pass: builds docker → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without (4 of 4 compose)
mesh/delivery covered after its failure: a later walk that contains it was delivered: plan-1791734868297400826 (novox/mesh-catalog at 0a558319 into main,…
9a1a97cc43
The controller pastes a setting into daemon.json as text and the runtime is its
only reader, so a bad size would surface as a runtime that does not start and a
quote could add any key. A step refuses the value first and gates the module.
The defaults are the one hand-set machine's, so it does not change; nothing
restarts the runtime, which takes the keys at its next start.
Author
Contributor

Delivery novox/mesh-catalog@9a1a97cc43b7 — failed since 2026-10-11T10:42:37Z

Covered: covered after its failure: a later walk that contains it was delivered: plan-1791734868297400826 (novox/mesh-catalog at 0a558319 into main, done, contains its merge e2d25b22)

Delivery plan — builds docker → ace, g14, novox, shanks; no bus step

  • tier 0: docker
  • ace: receives docker
  • g14: receives docker
  • novox: receives docker
  • shanks: receives docker

Machines

  • build-agent on ace: passed — carried by plan-1791713956203399849
  • docker on ace: rolled-back — ace failed what it was sent

Transitions

  • 2026-10-11 02:43 (new) → proposed (announced): novox/mesh-catalog#205's head announced
  • 2026-10-11 02:45 proposed → checked (checked): the verdict names this commit
  • 2026-10-11 02:45 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-11 10:41 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-11 10:41 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-11 10:42 delivering → failed (failed): its walk failed, carrying its own commit: a gate on a first machine (what it carried put back), a build, a machine

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

<!-- mesh-delivery:view --> **Delivery** `novox/mesh-catalog@9a1a97cc43b7` — **failed** since 2026-10-11T10:42:37Z **Covered**: covered after its failure: a later walk that contains it was delivered: plan-1791734868297400826 (novox/mesh-catalog at 0a558319 into main, done, contains its merge e2d25b22) **Delivery plan** — builds docker → ace, g14, novox, shanks; no bus step - tier 0: docker - ace: receives docker - g14: receives docker - novox: receives docker - shanks: receives docker **Machines** - build-agent on ace: passed — carried by plan-1791713956203399849 - docker on ace: rolled-back — ace failed what it was sent **Transitions** - 2026-10-11 02:43 (new) → proposed (announced): novox/mesh-catalog#205's head announced - 2026-10-11 02:45 proposed → checked (checked): the verdict names this commit - 2026-10-11 02:45 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-11 10:41 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-11 10:41 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-11 10:42 delivering → failed (failed): its walk failed, carrying its own commit: a gate on a first machine (what it carried put back), a build, a machine The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
Author
Contributor

Merge check at 9a1a97cc

  • mesh/merge-gate: PASS — every machine composes with the change as it did without (4 of 4 compose) (modules: docker)
  • 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 docker → ace, g14, novox, shanks; no bus step

  • tier 0: docker
  • ace: receives docker
  • g14: receives docker
  • novox: receives docker
  • shanks: receives docker
  • read by no module's build: modules/docker/README.md, modules/docker/cmd/docker-tools/logrotation_test.go

Run by the build seat on shanks as build-1791686639099932758 (builds --log build-1791686639099932758).

--- the gate: docker
docker: ok, 22 tool(s), invokes seat:mesh-controller.images; WARNING: socket, runtime, prune stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8)
long-running resources without health: 3
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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-11T02:40:01Z 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-11T02:40:01Z

modules the change moves:
  - docker (changed)

machines:
  - a machine (f35): composes; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check)
  - holds mesh-dns-resolver (idt): composes; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check)
  - 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; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check)
  - a machine (yvbpsm): composes; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check)

a merge would rebuild 1 module(s) in 1 tier(s): docker

notes:
  - modules/docker/README.md and modules/docker/cmd/docker-tools/logrotation_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 39547 strings of 658 files
ok  	git.novox.be/novox/mesh-catalog/checks/agenthome	0.012s
agent-home: no archive and no file written into under the agent's home
ok  	git.novox.be/novox/mesh-catalog/checks/paths	0.006s
paths: no module names another's state on its machine (3 known, listed to go)
long-running resources without health: 69, as kept
testing modules/docker
ok  	docker/cmd/docker-tools	1.055s
--- its merge-check-typescript.sh (typescript toolchain)
**Merge check** at `9a1a97cc` - `mesh/merge-gate`: **PASS** — every machine composes with the change as it did without (4 of 4 compose) (modules: docker) - `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 docker → ace, g14, novox, shanks; no bus step - tier 0: docker - ace: receives docker - g14: receives docker - novox: receives docker - shanks: receives docker - read by no module's build: modules/docker/README.md, modules/docker/cmd/docker-tools/logrotation_test.go Run by the build seat on shanks as `build-1791686639099932758` (`builds --log build-1791686639099932758`). ``` --- the gate: docker docker: ok, 22 tool(s), invokes seat:mesh-controller.images; WARNING: socket, runtime, prune stay(s) up and say(s) not how it is ready — judged by liveness alone, refused from 2026-11-18 (ADR 0240 rule 8) long-running resources without health: 3 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 1 module(s) changed against 4 machine(s), as the snapshot of 2026-10-11T02:40:01Z 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-11T02:40:01Z modules the change moves: - docker (changed) machines: - a machine (f35): composes; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check) - holds mesh-dns-resolver (idt): composes; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check) - 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; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check) - a machine (yvbpsm): composes; the change adds 3 resource(s) and removes 0 (+directory:docker.state, +file:docker.log-rotation, +process:docker.log-rotation-check) a merge would rebuild 1 module(s) in 1 tier(s): docker notes: - modules/docker/README.md and modules/docker/cmd/docker-tools/logrotation_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 39547 strings of 658 files ok git.novox.be/novox/mesh-catalog/checks/agenthome 0.012s agent-home: no archive and no file written into under the agent's home ok git.novox.be/novox/mesh-catalog/checks/paths 0.006s paths: no module names another's state on its machine (3 known, listed to go) long-running resources without health: 69, as kept testing modules/docker ok docker/cmd/docker-tools 1.055s --- its merge-check-typescript.sh (typescript toolchain) ```
mesh-admin merged commit e2d25b2248 into main 2026-10-11 10:21:53 +00:00
mesh-admin deleted branch fix/452-log-rotation-is-a-preference 2026-10-11 10:21: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/mesh-catalog#205