Review round 1: a carried module's queue consumer survives PruneHeard, a work-queue stream's restricted metadata is proven on the server config (issue 1178)

ConsumersOf's carried-module path (a module the tool runner carries, no
account of its own — mesh-mail's real shape) was not passing Queues
through, so its work-queue consumer was missing from the composed list
and PruneHeard would have removed what issueProcess made for it. Fixed,
with a test through Users -> ConsumersOf.

Extracted EnsureStream's config building into StreamConfigFor, a pure
function, so the dead-letters test can assert the restricted metadata
EnsureStream would actually send for a work-queue stream instead of
setting the dead letter's header by hand, which passed whether or not
modstreams.go's out.Restricted = true was there at all.
This commit is contained in:
jochen
2026-10-19 03:18:18 +02:00
parent 65632e7999
commit 9b7f9a7fd2
4 changed files with 67 additions and 11 deletions
+5 -1
View File
@@ -229,9 +229,13 @@ func ConsumersOf(users []Principal) []ModuleConsumer {
continue
}
for _, d := range p.Carries {
// **A carried module's work-queue consumer is still the controller's to make** (novox/hq ADR
// 0436 §1, §2, §6), the same reason its ordinary consumer is (ADR 0198): mesh-mail has no
// account of its own (NoAccount) and is carried here, but its process does, and the consumer
// it reads through must exist and survive PruneHeard whether or not the module itself speaks.
add(Principal{Kind: KindModule, Node: p.Node, Module: d.Module, Emits: d.Emits,
Consumes: d.Consumes, Serves: d.Serves, Holds: d.Holds, Uses: d.Uses, Watches: d.Watches,
Streams: d.Streams, Hears: ComposedHears(d)})
Streams: d.Streams, Hears: ComposedHears(d), Queues: d.Queues})
}
}
return out
+18 -10
View File
@@ -154,16 +154,10 @@ func Borrow(j *JetStream) *JetStream {
return &lent
}
// EnsureStream creates the stream if it is absent and brings it to match if it is present.
//
// **Idempotent, because the controller asserts on every start** rather than creating once at
// genesis: a stream somebody deleted, or a mesh raised from a restored backup, has to converge
// rather than run without the guarantee its messages assume.
//
// An update, not a delete and recreate. Recreating would discard every message the stream holds
// and every consumer's position in it — which for CONTROL means the pushes being held through a
// store restart, exactly the guarantee the stream exists for.
func (j *JetStream) EnsureStream(s Stream) error {
// StreamConfigFor is the server's own config for one of the mesh's streams, pure so the shape it builds —
// not least the restricted metadata a work-queue or a grant-restricted stream's dead letters age and hide
// by (novox/hq ADR 0436 §6, ADR 0376 §3) — is testable without a server.
func StreamConfigFor(s Stream) *nats.StreamConfig {
want := &nats.StreamConfig{
Name: s.Name,
Subjects: s.Subjects,
@@ -193,6 +187,20 @@ func (j *JetStream) EnsureStream(s Stream) error {
want.MaxMsgsPerSubject = 1
want.MaxAge = 0
}
return want
}
// EnsureStream creates the stream if it is absent and brings it to match if it is present.
//
// **Idempotent, because the controller asserts on every start** rather than creating once at
// genesis: a stream somebody deleted, or a mesh raised from a restored backup, has to converge
// rather than run without the guarantee its messages assume.
//
// An update, not a delete and recreate. Recreating would discard every message the stream holds
// and every consumer's position in it — which for CONTROL means the pushes being held through a
// store restart, exactly the guarantee the stream exists for.
func (j *JetStream) EnsureStream(s Stream) error {
want := StreamConfigFor(s)
switch _, err := j.js.StreamInfo(s.Name); {
case err == nil:
@@ -54,3 +54,28 @@ func TestTheOneProcessAWorkQueuesBusNamesGetsItsOwnConsumer(t *testing.T) {
t.Fatalf("the queue's consumer: %+v", c)
}
}
// review round 1, finding 2 (1178): mesh-mail's real shape has no account of its own (NoAccount) and is
// carried by the machine's tool runner — so its queue consumer has to come from the carried-module path in
// ConsumersOf, not only from a module with its own principal, or PruneHeard would remove what issueProcess
// made for it (novox/hq ADR 0436 §1, §2, §6).
func TestAWorkQueueConsumerSurvivesForAModuleTheRuntimeCarries(t *testing.T) {
users, err := Users(Records{Nodes: []string{"novox"}, Assigned: map[string][]Declared{"novox": {
{Module: RuntimeModule},
{Module: "mesh-mail", NoAccount: true,
Queues: []QueueOwner{{Process: "send", Stream: "MAIL_SENDS", MaxDeliver: 5}}},
}}})
if err != nil {
t.Fatal(err)
}
got := ConsumersOf(users)
var found bool
for _, c := range got {
if c.Module == "mesh-mail" && c.Consumer.Name == "novox_mesh-mail_send" && c.Consumer.Stream == "MAIL_SENDS" {
found = true
}
}
if !found {
t.Fatalf("mesh-mail's queue consumer is missing from the carried module's composition: %+v", got)
}
}