From 378853a97d43c8288ae663dafa57d681ef2a8563 Mon Sep 17 00:00:00 2001 From: jochen Date: Tue, 17 Nov 2026 21:23:37 +0100 Subject: [PATCH] =?UTF-8?q?Builder:=20a=20late=20look=20that=20numbers=20a?= =?UTF-8?q?=20done=20build=20with=20no=20reservation=20says=20so=20aloud?= =?UTF-8?q?=20and=20names=20builder=5Freserve=5Fdone=20(A-455,=20G=20?= =?UTF-8?q?=C2=A7349)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Builds: design 47 G A-455, A-473, §349 --- .../mesh-delivery-builder/internal/build/numbers.go | 9 +++++++++ .../mesh-delivery-builder/internal/build/run_test.go | 12 +++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/mesh-delivery-builder/internal/build/numbers.go b/modules/mesh-delivery-builder/internal/build/numbers.go index 928d283c..793b58ed 100644 --- a/modules/mesh-delivery-builder/internal/build/numbers.go +++ b/modules/mesh-delivery-builder/internal/build/numbers.go @@ -82,6 +82,15 @@ func (b *Builder) number(ctx context.Context, module string, m meshcatalog.Modul b.logf("%s at %s: %v", module, m.Fp2, fmt.Errorf("not numbered, the versions cannot be used: %w", err)) return versions.Numbering{}, true } + if done != nil && len(got.Versions) > 0 && b.Reserved != nil { + // A late look numbered a done build: G §349 retires numbering at a look, so one with no reservation and no release is + // said aloud with the recovery that reserves it (A-455), never taken in silently. + _, reserved, rerr := b.Reserved.ReservedFor(ctx, module, m.Fp2) + released, derr := b.Reserved.ReleasedFor(ctx, module, m.Fp2) + if rerr == nil && derr == nil && !reserved && !released { + b.logf("%s at %s: a late look numbered this done build (%v) and no version is reserved for it: builder_reserve_done reserves one and queues its publish", module, m.Fp2, got.Versions) + } + } if got.Refused != "" { b.logf("%s at %s: %s", module, m.Fp2, got.Refused) return got, true diff --git a/modules/mesh-delivery-builder/internal/build/run_test.go b/modules/mesh-delivery-builder/internal/build/run_test.go index d3d5c0c6..41f4d44f 100644 --- a/modules/mesh-delivery-builder/internal/build/run_test.go +++ b/modules/mesh-delivery-builder/internal/build/run_test.go @@ -468,9 +468,19 @@ func TestATrunkImageCallCarriesPublish(t *testing.T) { // 1705b; design 51 *The t.Errorf("a named package's done build: numbered %d more times with %v, %d image builds; want once with img %s and no build", nums.numbered-looks, nums.done, len(r.bm.callsOf("build_image_build")), digest) } + // A late look that numbers a done build with no reservation is said aloud, naming builder_reserve_done (G §349, A-455). + late := &logged{} + r.b.Logf, r.b.Reserved = late.logf, &fakeReservations{filled: true} + r.b.PackageNamed(context.Background(), "m") + r.b.Wait() + if !late.has("late look numbered", "builder_reserve_done") { + t.Errorf("a late look numbered a done build with no reservation and said %v", late.lines) + } + r.b.Reserved = nil + looks = nums.numbered r.b.PackageNamed(context.Background(), "other") r.b.Wait() - if nums.numbered != looks+1 { + if nums.numbered != looks { t.Errorf("a module the builder does not know was looked at") } // D-B5 (ADR 0666 §15; design 47, test 70): a build whose published packages cannot be read is refused, naming the