From d096ba37e399e8b1d8da39b0353e604ffb3199e3 Mon Sep 17 00:00:00 2001 From: jochen Date: Sun, 22 Nov 2026 01:33:35 +0100 Subject: [PATCH] BM3 install queue (sdk): DeclareAskWorkers declares a seat's every queue, the Node seat's install too A node puller bound no install worker, so the Node build seat stopped taking its install asks: the workers are now declared per AskQueues(language), not AskKinds. Builds: design 47 H2 H-A-403 --- modules/mesh-delivery-sdk/steprun/pull_bus.go | 2 +- .../steprun/pull_integration_test.go | 66 +++++++++++-------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/modules/mesh-delivery-sdk/steprun/pull_bus.go b/modules/mesh-delivery-sdk/steprun/pull_bus.go index 4053993a3..882c5055d 100644 --- a/modules/mesh-delivery-sdk/steprun/pull_bus.go +++ b/modules/mesh-delivery-sdk/steprun/pull_bus.go @@ -141,7 +141,7 @@ func DeclareAskWorkers(ctx context.Context, js jetstream.JetStream, language str Retention: jetstream.WorkQueuePolicy}); err != nil { return fmt.Errorf("the stream %s: %w", stream, err) } - for _, kind := range sdkstep.AskKinds { + for _, kind := range sdkstep.AskQueues(language) { worker, _ := sdkstep.AskWorker(language, kind) subject, _ := sdkstep.AskSubject(language, kind) // Two workers whose filters do not overlap: main's subject and the asker's, `.` (design 47 G §544). diff --git a/modules/mesh-delivery-sdk/steprun/pull_integration_test.go b/modules/mesh-delivery-sdk/steprun/pull_integration_test.go index 8bb9795f1..e2e196552 100644 --- a/modules/mesh-delivery-sdk/steprun/pull_integration_test.go +++ b/modules/mesh-delivery-sdk/steprun/pull_integration_test.go @@ -220,35 +220,45 @@ func TestAnAskThatMetTheNetworkIsGivenAgainAndADroppedOneIsEnded(t *testing.T) { func contains(s, sub string) bool { return strings.Contains(s, sub) } // Design 47 G §544: main's worker takes an ask put on main's subject and the named worker one put on the asker's, the two -// filters not overlapping. +// filters not overlapping. H2 H-A-403: the Node build seat's install is a queue of its own, its two workers declared too. func TestTheTwoWorkersTakeTheTwoFormsOfTheAcceptSubject(t *testing.T) { - js := askBus(t, 30*time.Second) - stream, _ := sdkstep.AskStream(sdkstep.AskGo) - worker, _ := sdkstep.AskWorker(sdkstep.AskGo, sdkstep.AskDelivery) - named, _ := sdkstep.AskNamedWorker(sdkstep.AskGo, sdkstep.AskDelivery) - main, _ := sdkstep.AskSubject(sdkstep.AskGo, sdkstep.AskDelivery) - for _, subject := range []string{main, main + ".mesh-builds"} { - if _, err := js.Publish(context.Background(), subject, []byte("{}")); err != nil { - t.Fatal(err) - } - } - for name, want := range map[string]string{worker: main, named: main + ".mesh-builds"} { - c, err := js.Consumer(context.Background(), stream, name) - if err != nil { - t.Fatal(err) - } - batch, err := c.Fetch(2, jetstream.FetchMaxWait(time.Second)) - if err != nil { - t.Fatal(err) - } - var got []string - for m := range batch.Messages() { - got = append(got, m.Subject()) - _ = m.Ack() - } - if len(got) != 1 || got[0] != want { - t.Errorf("%s took %v, want only %s", name, got, want) - } + for _, row := range []struct{ language, kind string }{ + {sdkstep.AskGo, sdkstep.AskDelivery}, + {sdkstep.AskNode, sdkstep.AskInstall}, + } { + t.Run(row.language+"/"+row.kind, func(t *testing.T) { + js := askBus(t, 30*time.Second) + if err := DeclareAskWorkers(context.Background(), js, row.language, 30*time.Second); err != nil { + t.Fatal(err) + } + stream, _ := sdkstep.AskStream(row.language) + worker, _ := sdkstep.AskWorker(row.language, row.kind) + named, _ := sdkstep.AskNamedWorker(row.language, row.kind) + main, _ := sdkstep.AskSubject(row.language, row.kind) + for _, subject := range []string{main, main + ".mesh-builds"} { + if _, err := js.Publish(context.Background(), subject, []byte("{}")); err != nil { + t.Fatal(err) + } + } + for name, want := range map[string]string{worker: main, named: main + ".mesh-builds"} { + c, err := js.Consumer(context.Background(), stream, name) + if err != nil { + t.Fatal(err) + } + batch, err := c.Fetch(2, jetstream.FetchMaxWait(time.Second)) + if err != nil { + t.Fatal(err) + } + var got []string + for m := range batch.Messages() { + got = append(got, m.Subject()) + _ = m.Ack() + } + if len(got) != 1 || got[0] != want { + t.Errorf("%s took %v, want only %s", name, got, want) + } + } + }) } }