From d822259cfa6c984d3c7b62a216de34d7d620483b Mon Sep 17 00:00:00 2001 From: jochen Date: Thu, 19 Nov 2026 17:11:52 +0100 Subject: [PATCH] Builder: the rebuild path passes Rebuild to the reserver, and a build-level test through the real reserver proves it (A-490b) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Builds: design 47 G A-490b, §369 Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy --- .../internal/build/reserve_test.go | 63 +++++++++++++++++++ .../internal/build/run.go | 2 +- 2 files changed, 64 insertions(+), 1 deletion(-) diff --git a/modules/mesh-delivery-builder/internal/build/reserve_test.go b/modules/mesh-delivery-builder/internal/build/reserve_test.go index d78264d4..dca68ef6 100644 --- a/modules/mesh-delivery-builder/internal/build/reserve_test.go +++ b/modules/mesh-delivery-builder/internal/build/reserve_test.go @@ -323,3 +323,66 @@ func TestAReservingTrunkBuildNeverEndsDoneWithoutItsVersion(t *testing.T) { }) } } + +// realReserve is the real versions.Reserver over a map, answering the builder's Reservations as the running builder's does. +type realReserve struct { + *versions.Reserver + reservations map[string][]byte +} + +func (r *realReserve) Filled() bool { return true } +func (r *realReserve) ReleasedFor(context.Context, string, string) (bool, error) { + return false, nil +} +func (r *realReserve) ReservedFor(ctx context.Context, module, fp string) (versions.ReservedVersion, bool, error) { + all, err := r.All(ctx) + for _, v := range all { + if v.Module == module && v.Fingerprint == fp { + return v, true, err + } + } + return versions.ReservedVersion{}, false, err +} +func (r *realReserve) Built(ctx context.Context, module, version string, digests map[string]string, _ map[string][]meshbuilds.Dependency) error { + for ref, d := range digests { + if _, err := r.Reserver.Built(ctx, module, version, ref, d, nil); err != nil { + return err + } + } + return nil +} + +type reserveMap struct{ *memStore } + +func (m reserveMap) KeysOf(ctx context.Context, _ string) ([]string, error) { return m.Keys(ctx) } +func (m reserveMap) Delete(_ context.Context, key string) error { + m.mu.Lock() + defer m.mu.Unlock() + delete(m.vals, key) + return nil +} + +// TestABuildAgainReservesAboveTheCatalogsHighestNotItsOwnStandingNumber: design 47 G A-490b, at the build, through the real +// reserver — a done key whose own fingerprint has an unreleased 0.1.30 standing, the catalog's highest 0.1.16, is built again +// under 0.1.17 (never 0.1.31), the standing reservation taken over. +func TestABuildAgainReservesAboveTheCatalogsHighestNotItsOwnStandingNumber(t *testing.T) { + r := newRig(t, goBundle) + r.mf.byDigest[mdigest('a')] = catalogue.Manifest{Module: "m", Version: "0.1", Build: &catalogue.Build{Artifacts: []catalogue.Artifact{goBundle}}} + if v := r.consider(t, "modules/m"); v.State != builds.BuildDone { + t.Fatalf("first build = %+v, want done", v) + } + store := reserveMap{newMem()} + real := &realReserve{Reserver: &versions.Reserver{Store: store, Filled: func() bool { return true }, + ReleasedOf: func(context.Context, string) ([]string, error) { return []string{"0.1.16"}, nil }}} + raw, _ := json.Marshal(versions.ReservedVersion{V: 1, Module: "m", Series: "0.1", Version: "0.1.30", Fingerprint: fp1, Artifacts: map[string]string{"m:tool": "d"}}) + if _, err := store.Create(context.Background(), versions.ReservedKey("m", "0.1"), raw); err != nil { + t.Fatal(err) + } + r.b.Reserved = real + got := r.b.BuildAgain(context.Background(), "m", fp1, "its publish was refused", "shanks.lead", 2*time.Second) + r.b.Wait() + cur, ok, err := real.Of(context.Background(), "m", "0.1.17") + if got.Refused != "" || err != nil || !ok || cur.Fingerprint != fp1 { + t.Fatalf("answer %+v; reservation of 0.1.17 = %+v (%v, %v); want built again under 0.1.17, the catalog's highest 0.1.16 plus one", got, cur, ok, err) + } +} diff --git a/modules/mesh-delivery-builder/internal/build/run.go b/modules/mesh-delivery-builder/internal/build/run.go index d3f98483..9b923a6a 100644 --- a/modules/mesh-delivery-builder/internal/build/run.go +++ b/modules/mesh-delivery-builder/internal/build/run.go @@ -662,7 +662,7 @@ func (b *Builder) try(ctx context.Context, module string, m meshcatalog.ModulesB // Reserved afresh, above the highest the catalog's versions answers, taking over the older unreleased reservation of this // fingerprint (A-455), never its standing number kept (A-490b); the build's own publish then runs. if b.Reserved.Filled() { - reserved, hasReserved = b.reserve(ctx, module, m, plan, b.originOf(key), false) + reserved, hasReserved = b.reserve(ctx, module, m, plan, b.originOf(key), true) } reserving = true } else if reserving && cl.Build.State != builds.BuildDone {