From d1ed5fd555406af7baa0a2625ec6928c5e3d6a78 Mon Sep 17 00:00:00 2001 From: jochen Date: Sun, 15 Nov 2026 16:36:54 +0100 Subject: [PATCH] assigner: read want-parts from a node record's capabilities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The want of mesh-delivery-pipeline on novox named no version and no part digests, so novox's node-engine of G composed nothing: the assigner looked for want-parts among a node's manifest reads, while a node-engine of G states it among its record's capabilities (design 47 G §525), so no node ever read as able to take parts. Both are read now. Builds: design 47 G §525, §526, §379 --- .../cmd/mesh-delivery-assigner/world.go | 3 ++- .../internal/assign/wants.go | 11 +++++++++- .../internal/assign/wants_test.go | 20 +++++++++++-------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go index 6738804f..ff932523 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/world.go @@ -407,7 +407,7 @@ func (w *world) wantsOf() map[string]map[string]mwc.Want { // nodes is what the six rules read of the nodes: presence, haves, and every provision's providers with their nodes. func (w *world) nodes(manifests map[string]catalogue.Manifest, assigned map[string][]string) assign.Nodes { n := assign.Nodes{Online: map[string]bool{}, Running: w.runningNow(), Haves: map[string]map[string]nodeengine.HaveByNodeModuleValue{}, Providers: map[string]map[string][]string{}, - Reads: map[string][]string{}} + Reads: map[string][]string{}, Capable: map[string][]string{}} n.Online = w.online() // The build a running statement names serves an acting edge's seat when its manifest claims it (design 47 G A-426). n.Serves = func(r nodeengine.Running, seat string) (bool, bool) { @@ -429,6 +429,7 @@ func (w *world) nodes(manifests map[string]catalogue.Manifest, assigned map[stri // What the node's engine reads (ADR 0614 §4); a record that states none is read as the baseline. if h, err := nodeengineclient.DecodeHaveNode(value); err == nil && h.Record != nil { n.Reads[node] = h.Record.ManifestReads + n.Capable[node] = h.Record.Capabilities // where a node-engine of G states want-parts (§525) } continue } diff --git a/modules/mesh-delivery-assigner/internal/assign/wants.go b/modules/mesh-delivery-assigner/internal/assign/wants.go index 08b29d8c..61023367 100644 --- a/modules/mesh-delivery-assigner/internal/assign/wants.go +++ b/modules/mesh-delivery-assigner/internal/assign/wants.go @@ -133,6 +133,12 @@ func (m Module) actingWaiting(node string, n Nodes) (string, bool) { return "", false } +// ReadsParts says whether node's node-engine reads a want's version, parts and kept-on: it states WantParts among its record's +// capabilities, where a node-engine of G states it (design 47 G §525), or, as read before, among its manifest reads. +func (n Nodes) ReadsParts(node string) bool { + return slices.Contains(n.Capable[node], WantParts) || slices.Contains(n.Reads[node], WantParts) +} + // WantParts is the capability a node-engine of G states (ADR 0614 §4, design 47 G §525): it reads a want's `parts` and `kept-on`. const WantParts = "want-parts" @@ -153,7 +159,7 @@ func (n Nodes) withKept(m Module, node string, w mwc.Want) mwc.Want { return w } k, ok := m.KeptBuilds(w.Fp) - if !ok || !slices.Contains(n.Reads[node], WantParts) { + if !ok || !n.ReadsParts(node) { return w } w.Parts, w.KeptOn, w.Version = k.Parts, k.KeptOn, k.Version @@ -182,6 +188,9 @@ type Nodes struct { // Reads is, by node, the reader capabilities its node-engine states in its node record (nodeengine.NodeRecord.ManifestReads, // ADR 0614 §4). A node with none, or none read, is read as stating the baseline (catalogue.StatedManifestReads). Reads map[string][]string + // Capable is, by node, the capabilities its node-engine states in its node record (nodeengine.NodeRecord.Capabilities): a + // node-engine of G states WantParts there (design 47 G §525). + Capable map[string][]string // Serves says whether the build of a running statement serves an acting edge's seat, from that build's manifest: known false // when its manifest cannot be read (design 47 G A-426). Nil: none is read. Serves func(r nodeengine.Running, seat string) (serves, known bool) diff --git a/modules/mesh-delivery-assigner/internal/assign/wants_test.go b/modules/mesh-delivery-assigner/internal/assign/wants_test.go index 389265c5..f20cd6fc 100644 --- a/modules/mesh-delivery-assigner/internal/assign/wants_test.go +++ b/modules/mesh-delivery-assigner/internal/assign/wants_test.go @@ -1604,18 +1604,22 @@ func TestAProviderRunsHealthyByItsRunning(t *testing.T) { func TestAWantNamesAKeptBuildsPartsAndNodeForANodeThatReadsThem(t *testing.T) { kept := KeptBuild{Parts: map[string]string{"mail:image": "sha256:1"}, KeptOn: "g14", Version: "1.2.3"} for name, row := range map[string]struct { - reads []string - kept func(string) (KeptBuild, bool) - wanted bool + reads []string + kept func(string) (KeptBuild, bool) + wanted bool + capable []string }{ - "states it": {[]string{WantParts}, func(fp string) (KeptBuild, bool) { return kept, fp == fNew }, true}, - "does not state": {[]string{"form:oci"}, func(fp string) (KeptBuild, bool) { return kept, fp == fNew }, false}, - "build not kept": {[]string{WantParts}, func(string) (KeptBuild, bool) { return KeptBuild{}, false }, false}, - "no kept builds": {[]string{WantParts}, nil, false}, - "another fingerp": {[]string{WantParts}, func(fp string) (KeptBuild, bool) { return kept, fp == fOld }, false}, + "states it": {[]string{WantParts}, func(fp string) (KeptBuild, bool) { return kept, fp == fNew }, true, nil}, + // §525: a node-engine of G states it among its record's capabilities, not its manifest reads. + "states it as a capability": {[]string{"form:oci"}, func(fp string) (KeptBuild, bool) { return kept, fp == fNew }, true, []string{WantParts}}, + "does not state": {[]string{"form:oci"}, func(fp string) (KeptBuild, bool) { return kept, fp == fNew }, false, nil}, + "build not kept": {[]string{WantParts}, func(string) (KeptBuild, bool) { return KeptBuild{}, false }, false, nil}, + "no kept builds": {[]string{WantParts}, nil, false, nil}, + "another fingerp": {[]string{WantParts}, func(fp string) (KeptBuild, bool) { return kept, fp == fOld }, false, nil}, } { m, n := ready() n.Reads = map[string][]string{"ace": row.reads, "g14": row.reads} + n.Capable = map[string][]string{"ace": row.capable} m.KeptBuilds = row.kept w := Wants(m, heardOfHaves(n), wantedOld(), nil).Wants["ace"] if w.Fp != fNew || (w.KeptOn == "g14") != row.wanted || (w.Version == "1.2.3") != row.wanted || (len(w.Parts) == 1) != row.wanted {