From 5548e1030cc0ba6cad10ff6ab287676ed3dcd3f0 Mon Sep 17 00:00:00 2001 From: jochen Date: Wed, 28 Oct 2026 18:10:58 +0100 Subject: [PATCH] mesh-config reads placement from the seat's state (held by the assigner), not the indexer's --- modules/mesh-config/cmd/mesh-config/resolve.go | 4 ++-- modules/mesh-config/cmd/mesh-config/sources.go | 6 +++--- modules/mesh-config/module.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/mesh-config/cmd/mesh-config/resolve.go b/modules/mesh-config/cmd/mesh-config/resolve.go index ccf35335..b57bf3dc 100644 --- a/modules/mesh-config/cmd/mesh-config/resolve.go +++ b/modules/mesh-config/cmd/mesh-config/resolve.go @@ -21,9 +21,9 @@ const ( ProposalsState = "proposals" AssignmentsRead = "mesh-controller.assignments" - // PlacementRead is the indexer's placement, read from the catalogue at each merge (novox/hq ADR 0549 §2, §3): each + // PlacementRead is the seat mesh-placement's state, held by the assigner (novox/hq ADR 0567 §1, §8): each // node's key `placement.` with the modules placed there. - PlacementRead = "mesh-delivery-indexer.placement" + PlacementRead = "mesh-delivery-assigner.placement" DeclaredConfigRead = "mesh-controller.declared-config" PredefinedRead = "mesh-controller.predefined" diff --git a/modules/mesh-config/cmd/mesh-config/sources.go b/modules/mesh-config/cmd/mesh-config/sources.go index 36adb3c8..6cd7e88d 100644 --- a/modules/mesh-config/cmd/mesh-config/sources.go +++ b/modules/mesh-config/cmd/mesh-config/sources.go @@ -27,9 +27,9 @@ func (c *Config) sources() (Sources, error) { }); err != nil { return s, fmt.Errorf("the assignments cannot be read: %w", err) } - // And every module the catalog's placement names on a node (ADR 0549 §3): until ADR 0547's third milestone both + // And every module the seat's placement names on a node (ADR 0549 §3): until ADR 0547's third milestone both // sources stand (ADR 0549 §5), so a pair either names is resolved, and none loses its values while the two differ. - // Placement that cannot be read yet (the indexer's state not on the bus) leaves the assignments alone, said. + // Placement that cannot be read yet (the seat's state not on the bus) leaves the assignments alone, said. standing := map[string]bool{} for _, a := range s.Assignments { standing[a.Node+"."+a.Module] = true @@ -57,7 +57,7 @@ func (c *Config) sources() (Sources, error) { } return nil }); err != nil { - problems = append(problems, fmt.Sprintf("the catalog's placement cannot be read, so the assignments alone are resolved: %v", err)) + problems = append(problems, fmt.Sprintf("the seat's placement cannot be read, so the assignments alone are resolved: %v", err)) } if err := c.each(DeclaredConfigRead, func(key string, raw []byte) error { m, err := ParseModuleDeclarations(raw) diff --git a/modules/mesh-config/module.json b/modules/mesh-config/module.json index d6b5bdd0..ca7e0a2f 100644 --- a/modules/mesh-config/module.json +++ b/modules/mesh-config/module.json @@ -29,7 +29,7 @@ ], "reads": [ "mesh-controller.assignments", - "mesh-delivery-indexer.placement", + "mesh-delivery-assigner.placement", "mesh-controller.declared-config", "mesh-controller.predefined" ],