From 744204c5ab9fb3cef42c2ceb54ffdc7574ae31c1 Mon Sep 17 00:00:00 2001 From: jochen Date: Fri, 20 Nov 2026 17:36:54 +0100 Subject: [PATCH] Builder: releases heard wake the package wait; its setting package-wait-minutes (H-A-165) The process tells the builder each version-released it takes in and gives it the newest release its record keeps, so an unpinned package's step ask wakes on the event and pins the release; the wait's bound is the setting package-wait-minutes (default 10), carried as a file under the state dir like revision-wait-minutes. Builds: design 47 H H-A-165, H-A-156, H-A-155 --- .../cmd/mesh-delivery-builder/main.go | 9 +++++++++ .../cmd/mesh-delivery-builder/reserve.go | 18 ++++++++++++------ .../cmd/mesh-delivery-builder/reserve_test.go | 5 +++++ .../internal/versions/reserve_test.go | 9 +++++++++ modules/mesh-delivery-builder/manifest_test.go | 6 +++--- modules/mesh-delivery-builder/module.json | 17 +++++++++++++++++ 6 files changed, 55 insertions(+), 9 deletions(-) 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 db166372..cdc26dbd 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/main.go @@ -222,6 +222,12 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro return err } b.RevisionWait = time.Duration(revisionWait) * time.Minute + // A step ask naming a package with no pin waits for its release (H-A-165); its bound is package-wait-minutes. + packageWait, err := numberFile(getenv("MESH_BUILDER_PACKAGE_WAIT_FILE"), int(build.DefaultPackageWait/time.Minute)) + if err != nil { + return err + } + b.PackageWait = time.Duration(packageWait) * time.Minute waitsBucket := process.AwaitBucket(ctx, js, conn, builds.StateBucket(cred.Module, build.WaitsState), "the toolchain waits are kept in memory only, and builder_waits shows none", logger.Printf) b.Waits = newWaitsKept(waitsBucket, func(ctx context.Context, event, id string, body any) error { return emitEvent(context.WithoutCancel(ctx), js, cred, event, id, body) @@ -236,6 +242,9 @@ func run(ctx context.Context, getenv func(string) string, logOut io.Writer) erro return emitSeatEvent(context.WithoutCancel(ctx), js, cred, meshbuilds.SubjectPackagePublished, "package-published-"+p.Module+"-"+p.Version+"-"+p.Artifact, p) } b.Reserved = reserved + // A release heard, or the newest the builder's record keeps, pins a package an entry names with none (H-A-165). + reserved.heardReleased = b.VersionReleased + b.NewestReleased = reserved.r.NewestReleased // The last versions-filled the stream keeps is read at the start (design 47 G §369, §372): a restart does not lose it. reserved.readFilled(ctx, lastKeptOf(js, cred, logger.Printf), sleeps) // A state bound later numbers the builds looked at without it. 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 8923151c..18b19181 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve.go @@ -44,12 +44,15 @@ type reservations struct { // built asks a done build's publish (design 47 G A-457a), released ends its item; nil are none. built func(ctx context.Context, module, version string) error released func(ctx context.Context, module, version string) - filled atomic.Bool - bounds func() jetstream.KeyValue - found *findings - bound time.Duration - wake func(context.Context) - logf func(string, ...any) + // heardReleased is told each version-released taken in (design 47 H H-A-165): a step ask waiting for a package of the + // module wakes. Nil tells nobody. + heardReleased func(module, version string) + filled atomic.Bool + bounds func() jetstream.KeyValue + found *findings + bound time.Duration + wake func(context.Context) + logf func(string, ...any) // call asks a seat's verb: the git seat's tag (design 47 G §370). call toolCaller // say says package-published on the seat mesh-builds; nil says none. @@ -252,6 +255,9 @@ func (rv *reservations) heard(ctx context.Context, m jetstream.Msg) bool { if rv.released != nil { rv.released(ctx, ev.Module, ev.Version) } + if rv.heardReleased != nil { + rv.heardReleased(ev.Module, ev.Version) + } rv.found.clear(ctx, versions.VersionUnreleased, meshconditionsclient.ScopeModule, ev.Module) default: return false diff --git a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go index 11075cbd..cd9b6791 100644 --- a/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go +++ b/modules/mesh-delivery-builder/cmd/mesh-delivery-builder/reserve_test.go @@ -134,10 +134,15 @@ func TestTheCatalogsWordsMoveTheReservations(t *testing.T) { if err != nil || !strings.Contains(got.Summary, "m:b unpublished") || strings.Contains(got.Summary, "m:a unpublished") || !strings.Contains(got.Summary, "1.4.3") { t.Fatalf("finding = %+v (%v), want version-unreleased naming m:b of 1.4.3", got, err) } + var heardReleases []string // H-A-165: a release heard wakes a step ask waiting for a package of the module + rv.heardReleased = func(m, v string) { heardReleases = append(heardReleases, m+" "+v) } released := &wakeMsg{subject: meshcatalog.SubjectVersionReleased, data: []byte(`{"v":1,"module":"m","version":"1.4.3","source":1,"artifacts":[]}`)} if !rv.heard(ctx, released) || !released.acked { t.Fatalf("version-released was not taken in (acked %v)", released.acked) } + if strings.Join(heardReleases, ", ") != "m 1.4.3" { + t.Errorf("the release heard was told %v, want m 1.4.3 (H-A-165)", heardReleases) + } if strings.Join(items, ", ") != "asked m 1.4.3, ended m 1.4.3" { t.Errorf("publish items %v, want the build's end to ask the publish and the release to end it", items) } diff --git a/modules/mesh-delivery-builder/internal/versions/reserve_test.go b/modules/mesh-delivery-builder/internal/versions/reserve_test.go index 3b68a10b..925f49fd 100644 --- a/modules/mesh-delivery-builder/internal/versions/reserve_test.go +++ b/modules/mesh-delivery-builder/internal/versions/reserve_test.go @@ -201,11 +201,13 @@ func TestAReleaseIsRecordedByFingerprintBeforeItsReservationGoes(t *testing.T) { t.Errorf("reservations left: %v", all) } // One key per module holds the last releases, the oldest dropped (A-456b). + newest := "" for _, fp := range []string{"src2:b1", "src2:b2"} { n, err := r.Reserve(ctx, "m", "0.1", []string{"m:a"}, Source{Fingerprint: fp}) if err != nil { t.Fatal(err) } + newest = n.Version if _, err := r.Released(ctx, "m", n.Version); err != nil { t.Fatal(err) } @@ -219,6 +221,13 @@ func TestAReleaseIsRecordedByFingerprintBeforeItsReservationGoes(t *testing.T) { if ok, _ := r.ReleasedFor(ctx, "m", "src2:b2"); !ok { t.Error("the newest release is not kept") } + // H-A-165: the newest version the record keeps is the pin of a package with none. + if v, ok, err := r.NewestReleased(ctx, "m"); !ok || err != nil || v != newest { + t.Errorf("newest released of m = %q, %v (%v), want %s", v, ok, err, newest) + } + if _, ok, _ := r.NewestReleased(ctx, "other"); ok { + t.Error("a module never released has a newest release") + } } // TestARebuildReservesAboveTheCatalogsHighestWhateverItsStandingNumberWas: design 47 G A-490b — a build again of a done key replaces diff --git a/modules/mesh-delivery-builder/manifest_test.go b/modules/mesh-delivery-builder/manifest_test.go index c2728780..f39d8693 100644 --- a/modules/mesh-delivery-builder/manifest_test.go +++ b/modules/mesh-delivery-builder/manifest_test.go @@ -186,9 +186,9 @@ func TestManifestDeclarations(t *testing.T) { // 1607/AC1 m.Streams[2].Name != "mesh-delivery-builder-findings" || !reflect.DeepEqual(m.Streams[2].Events, []string{"finding-written.*", "finding-cleared.*", "findings-stated.*"}) { t.Errorf("streams = %+v, want waits with wait-held.** and wait-ended.**, 7 days, 16 MiB, the builds' stream (build.ended.**, 7 days, kept last per subject: design 47 G A-181) and the findings' stream", m.Streams) } - if c, ok := m.Config["toolchain-wait-minutes"]; !ok || c.Default != float64(60) || len(m.Config) != 6 || m.Config["revision-wait-minutes"].Default != float64(2) || + if c, ok := m.Config["toolchain-wait-minutes"]; !ok || c.Default != float64(60) || len(m.Config) != 7 || m.Config["revision-wait-minutes"].Default != float64(2) || m.Config["package-wait-minutes"].Default != float64(10) || m.Config["publish-pause"].Default != float64(30) || m.Config["publish-pause-max"].Default != float64(30) || m.Config["publish-tries"].Default != float64(8) { - t.Errorf("config = %+v, want toolchain-wait-minutes of 60, revision-wait-minutes of 2 (H-A-156), the publish settings 30 s, 30 min and 8 tries (design 47 G §588, §633, A-457a)", m.Config) + t.Errorf("config = %+v, want toolchain-wait-minutes of 60, revision-wait-minutes of 2 (H-A-156), package-wait-minutes of 10 (H-A-165), the publish settings 30 s, 30 min and 8 tries (design 47 G §588, §633, A-457a)", m.Config) } // Design 47 G §349: version.numbered is no longer said; old-form-closed on the family version, apart from the builds' ends. if want := []string{"build.asked-again", "version.old-form-closed"}; !reflect.DeepEqual(m.Emits, want) { @@ -241,7 +241,7 @@ func TestManifestProcess(t *testing.T) { // 1607/AC1 t.Errorf("process = %v", p) } env, _ := p["env"].(map[string]any) - if len(env) != 7 || env["MESH_BUILDER_REVISION_WAIT_FILE"] != "${dir:state}/revision-wait-minutes" || env["MESH_BUILDER_PUBLISH_TRIES_FILE"] != "${dir:state}/publish-tries" || env["MESH_BROKER_FILE"] != "${dir:state}/broker" || env["MESH_BUILDER_TOOLCHAIN_WAIT_FILE"] != "${dir:state}/toolchain-wait-minutes" { + if len(env) != 8 || env["MESH_BUILDER_REVISION_WAIT_FILE"] != "${dir:state}/revision-wait-minutes" || env["MESH_BUILDER_PACKAGE_WAIT_FILE"] != "${dir:state}/package-wait-minutes" || env["MESH_BUILDER_PUBLISH_TRIES_FILE"] != "${dir:state}/publish-tries" || env["MESH_BROKER_FILE"] != "${dir:state}/broker" || env["MESH_BUILDER_TOOLCHAIN_WAIT_FILE"] != "${dir:state}/toolchain-wait-minutes" { t.Errorf("env = %v, want the broker file and the path of the toolchain wait's file, never the setting itself (design 47 G §672, A-71)", p["env"]) } for k, v := range env { diff --git a/modules/mesh-delivery-builder/module.json b/modules/mesh-delivery-builder/module.json index f0dbe647..144223d5 100644 --- a/modules/mesh-delivery-builder/module.json +++ b/modules/mesh-delivery-builder/module.json @@ -155,6 +155,14 @@ "trusted": false, "default": 2 }, + "package-wait-minutes": { + "type": "number", + "description": "minutes a build step ask waits for the release of a mesh package its entry names with no pin before it fails, building nothing (design 47 H H-A-165).", + "minimum": 1, + "maximum": 120, + "trusted": false, + "default": 10 + }, "publish-pause": { "type": "number", "description": "seconds before a version's second publish try, doubled per try up to publish-pause-max (design 47 G A-457a).", @@ -239,6 +247,14 @@ "mode": "0600", "content": "${config:revision-wait-minutes}" }, + { + "id": "package-wait", + "type": "file", + "path": "${dir:state}/package-wait-minutes", + "owner": "mesh-delivery-builder", + "mode": "0600", + "content": "${config:package-wait-minutes}" + }, { "id": "publish-pause", "type": "file", @@ -286,6 +302,7 @@ "MESH_BROKER_FILE": "${dir:state}/broker", "MESH_BUILDER_TOOLCHAIN_WAIT_FILE": "${dir:state}/toolchain-wait-minutes", "MESH_BUILDER_REVISION_WAIT_FILE": "${dir:state}/revision-wait-minutes", + "MESH_BUILDER_PACKAGE_WAIT_FILE": "${dir:state}/package-wait-minutes", "MESH_BUILDER_PUBLISH_PAUSE_FILE": "${dir:state}/publish-pause", "MESH_BUILDER_PUBLISH_PAUSE_MAX_FILE": "${dir:state}/publish-pause-max", "MESH_BUILDER_PUBLISH_TRIES_FILE": "${dir:state}/publish-tries",