diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go index faf0ad6c0..c9aa68836 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go @@ -255,9 +255,7 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro // A package's number reserved is said as the seat mesh-builds' version-reserved, so the indexer re-pins at the reservation (§805). reserved.names = versions.NamesFrom(versions.EntriesOf(branches)) reserved.r.Names = reserved.names // a Go package's module path names its tag's directory (§796) - reserved.sayReserved = func(ctx context.Context, ev meshbuilds.VersionReservedEvent) error { - return emitSeatEvent(context.WithoutCancel(ctx), js, cred, meshbuilds.SubjectVersionReserved, "version-reserved-"+ev.Module+"-"+ev.Version+"-"+ev.Artifact, ev) - } + reserved.sayReserved = sayReservedOn(js, cred) b.Reserved = reserved // A take-over of a series' reservation by another fingerprint withdraws the older build (H-A-225). reserved.withdraw = b.Withdraw diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/publishes_integration_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/publishes_integration_test.go index 0ea8fa90f..103aac070 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/publishes_integration_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/publishes_integration_test.go @@ -13,6 +13,7 @@ import ( "testing" "time" + "github.com/nats-io/nats.go" "github.com/nats-io/nats.go/jetstream" "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" @@ -30,7 +31,8 @@ import ( // A live publish enqueued behind 100 again items while the builder was away is sent first; a dropped item is never sent, and // put again within the duplicates window is not stored; the move of the old state run twice puts each item once, and the // builder removes the old state's bucket itself (H-A-461 (1)). The seat mesh-builds' verb publish-queue reads the stream: counts -// per holder and class, the oldest and newest, the live item listed first (H-A-454). Then §796's tag at another commit and +// per holder and class, the oldest and newest, the live item listed first (H-A-454). Then §796's tag at another commit, its +// reservation's version-reserved waited on by name (§821), and // §794's backlog held six minutes, as steps (H-A-453 (3)). func TestThePublishQueueSendsLiveFirstAndNeverADroppedItem(t *testing.T) { b := startBed(t) @@ -218,12 +220,39 @@ func TestThePublishQueueSendsLiveFirstAndNeverADroppedItem(t *testing.T) { rv.r.Names = func(context.Context, string, string) (string, bool, error) { return "git.example/o/r/modules/m4", true, nil } + // Design 47 H2 §821, §805: the reservation is said as the seat mesh-builds' version-reserved, said as the process says it + // (sayReservedOn), and waited on by the seat and the event's name. + rv.names, rv.sayReserved = rv.r.Names, sayReservedOn(b.js, process.Account{Module: builds.BuilderModule, Node: "n1"}) + said, err := nats.Connect(b.srvURL, nats.UserInfo("ctl", "pw")) + if err != nil { + t.Fatal(err) + } + defer said.Close() + reservedCh := make(chan *nats.Msg, 4) + rs, err := said.ChanSubscribe(meshbuilds.SubjectVersionReserved, reservedCh) + if err != nil { + t.Fatal(err) + } + defer rs.Unsubscribe() + if err := said.Flush(); err != nil { + t.Fatal(err) + } v4, err := rv.Reserve(ctx, "m4", "0.2", []string{"m4:lib"}, versions.Source{Fingerprint: "src2:m4", GoPackage: true, GoArtifact: "lib", Repository: "o/r", Commit: "c-mine", Branch: "main", CatalogRevision: 1}) elsewhere := views.FindingKey(meshconditionsclient.ScopeModule, "m4", versions.VersionTaggedElsewhere) if _, raised := found.vals[elsewhere]; err != nil || v4.Version != "0.2.1" || v4.Tag != "modules/m4/v0.2.1" || !raised { t.Fatalf("m4 reserved %+v (%v), %s raised %v: want 0.2.1 past 0.2.0's tag at another commit, its tag modules/m4/v0.2.1, and the finding", v4, err, elsewhere, raised) } + select { + case m := <-reservedCh: + ev, _, err := meshbuilds.DecodeVersionReservedEvent(m.Data) + if err != nil || ev.Module != "m4" || ev.Artifact != "m4:lib" || ev.Path != "git.example/o/r/modules/m4" || ev.Version != "0.2.1" || + ev.Fingerprint != "src2:m4" || ev.Revision != "main.1" || m.Header.Get("x-source") != builds.BuilderModule { + t.Errorf("version-reserved = %+v (%v) from %q, want m4:lib at 0.2.1, its path, fingerprint src2:m4 and revision main.1, said by the builder", ev, err, m.Header.Get("x-source")) + } + case <-time.After(10 * time.Second): + t.Fatal("no version-reserved of m4's reservation within 10 s on " + meshbuilds.SubjectVersionReserved) + } catalogEvents, err := b.js.StreamNameBySubject(ctx, meshcatalog.SubjectVersionReleased) // the bed's stream of the catalog's events if err != nil { t.Fatal(err) diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go index 76ac4dc12..53e946a10 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go @@ -16,6 +16,7 @@ import ( "git.novox.be/novox/mesh-contracts/health-and-repair/go/clients/meshconditionsclient" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/git" "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog" + "git.novox.be/novox/mesh-sdk/go/process" "mesh-delivery-builder/internal/build" "mesh-delivery-builder/internal/versions" @@ -105,6 +106,14 @@ func (rv *reservations) reservedSaid(ctx context.Context, v versions.ReservedVer } } +// sayReservedOn says version-reserved on the seat mesh-builds' events as cred, under an event id of the module, the version and +// the artifact, so a reservation said again is stored once (design 47 H2 §805, §821). +func sayReservedOn(js jetstream.JetStream, cred process.Account) func(context.Context, meshbuilds.VersionReservedEvent) error { + return func(ctx context.Context, ev meshbuilds.VersionReservedEvent) error { + return emitSeatEvent(context.WithoutCancel(ctx), js, cred, meshbuilds.SubjectVersionReserved, "version-reserved-"+ev.Module+"-"+ev.Version+"-"+ev.Artifact, ev) + } +} + // newReservations makes the reserving over store; the released versions of a module are asked of the seat mesh-catalog's // verb versions through call (design 47 G §348), the only source numbering reads them from. func newReservations(store versions.ReserveStore, call toolCaller, bounds func() jetstream.KeyValue, found *findings, wake func(context.Context), logf func(string, ...any)) *reservations { diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/order_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/order_test.go index 590ea849d..ea457f0ec 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/order_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/order_test.go @@ -360,7 +360,9 @@ func TestAMoversBuildWaitsForItsDependenciesInThePipeline(t *testing.T) { if placed(p, "ext") || p.Outcome != seat.PipelineOutcomeRunning { t.Errorf("after builder's rerun passed, main.7 %s, ext %+v; want running, ext waiting for tool's build", p.Outcome, stepsOf(p, "ext")) } - if !slices.ContainsFunc(journal, func(l string) bool { return strings.Contains(l, "main.7: tool, ext, not asked on builder, which built now, placed again") }) { + if !slices.ContainsFunc(journal, func(l string) bool { + return strings.Contains(l, "main.7: tool, ext, not asked on builder, which built now, placed again") + }) { t.Errorf("the journal %q does not say tool and ext are placed again", journal) } })