Accept and ignore a file's trusted, and give each runtime its own time to answer
mesh/merge-gate pass: builds mesh-host → ace, g14, novox, shanks; no bus step; every machine composes with the change as it did without (4 of 4 compose)
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered

The fourth review (hq issue 339): `trusted` is the catalogue's word and the
controller takes it out, but a controller that passes it on, an older one or
one rolled back to, must not cost a node its whole declaration. A file now
accepts it and nothing reads it; any other resource still refuses it. And a
podman that hangs no longer eats docker's ten seconds.
This commit is contained in:
jochen
2026-10-09 01:42:09 +02:00
parent ff2553f4db
commit 7c046a8a1d
3 changed files with 37 additions and 7 deletions
+8 -7
View File
@@ -152,14 +152,15 @@ func readRuntimeRoots(ctx context.Context, run Runner) []string {
}
}
if run != nil {
ask, cancel := context.WithTimeout(ctx, 10*time.Second)
if root, err := run(ask, "docker", "info", "--format", "{{.DockerRootDir}}"); err == nil {
add(root)
// Each runtime has its own ten seconds: one that hangs costs the other nothing.
for _, q := range [][]string{{"docker", "info", "--format", "{{.DockerRootDir}}"},
{"podman", "info", "--format", "{{.Store.GraphRoot}}"}} {
ask, cancel := context.WithTimeout(ctx, 10*time.Second)
if root, err := run(ask, q[0], q[1:]...); err == nil {
add(root)
}
cancel()
}
if root, err := run(ask, "podman", "info", "--format", "{{.Store.GraphRoot}}"); err == nil {
add(root)
}
cancel()
}
daemonJSON := func(path string) {
raw, err := os.ReadFile(path)