Builder: a done key built again by hand reserves afresh above the released versions, never keeping the standing number (A-490b)
Builds: design 47 G A-490b, A-490, A-455, §369, §412 Claude-Session: https://claude.ai/code/session_01JG73KHUnBze48rdua8u2sy
This commit is contained in:
@@ -29,7 +29,8 @@ type fakeReservations struct {
|
||||
built map[string]string
|
||||
sources []versions.Source
|
||||
deps map[string][]meshbuilds.Dependency
|
||||
fail error // the reservation cannot be made (the catalog's versions cannot be read)
|
||||
next string // the version Reserve answers when set, else the series' .5
|
||||
fail error // the reservation cannot be made (the catalog's versions cannot be read)
|
||||
}
|
||||
|
||||
func (f *fakeReservations) ReleasedFor(_ context.Context, _, fp string) (bool, error) {
|
||||
@@ -52,6 +53,9 @@ func (f *fakeReservations) Reserve(_ context.Context, module, series string, art
|
||||
return versions.ReservedVersion{}, f.fail
|
||||
}
|
||||
f.reserved, f.series, f.sources = append(f.reserved, artifacts), append(f.series, series), append(f.sources, src)
|
||||
if f.next != "" {
|
||||
return versions.ReservedVersion{Module: module, Series: series, Version: f.next}, nil
|
||||
}
|
||||
return versions.ReservedVersion{Module: module, Series: series, Version: series + ".5"}, nil
|
||||
}
|
||||
|
||||
@@ -279,8 +283,10 @@ func TestAReservingTrunkBuildNeverEndsDoneWithoutItsVersion(t *testing.T) {
|
||||
for _, c := range []struct {
|
||||
name string
|
||||
released bool
|
||||
standing bool // a reservation of 0.1.0 stands, and the catalog now answers 0.1.16 released
|
||||
refuse string
|
||||
}{
|
||||
{name: "a standing 0.1.0 reservation is not kept: the rebuild reserves afresh, 0.1.17 above the released 0.1.16", standing: true},
|
||||
{name: "a done key whose version is not released is built again under a reserved version"},
|
||||
{name: "a done key whose version is released is refused", released: true, refuse: "its version is released"},
|
||||
} {
|
||||
@@ -291,6 +297,9 @@ func TestAReservingTrunkBuildNeverEndsDoneWithoutItsVersion(t *testing.T) {
|
||||
t.Fatalf("first build = %+v, want done", v)
|
||||
}
|
||||
res := &fakeReservations{filled: true, released: map[string]bool{fp1: c.released}}
|
||||
if c.standing {
|
||||
res.sources, res.next = []versions.Source{{Fingerprint: fp1}}, "0.1.17" // ReservedFor answers a held reservation
|
||||
}
|
||||
r.b.Reserved = res
|
||||
asked := len(r.asks.Asks())
|
||||
got := r.b.BuildAgain(context.Background(), "m", fp1, "its publish was refused", "shanks.lead", 2*time.Second)
|
||||
@@ -304,8 +313,12 @@ func TestAReservingTrunkBuildNeverEndsDoneWithoutItsVersion(t *testing.T) {
|
||||
if got.Refused != "" || len(r.asks.Asks()) == asked || len(res.reserved) != 1 {
|
||||
t.Fatalf("answer %+v with %d new asks, reserved %v; want built again under one reserved version", got, len(r.asks.Asks())-asked, res.reserved)
|
||||
}
|
||||
if _, ok := res.built["0.1.5"]; !ok {
|
||||
t.Fatalf("built %v; want the digests recorded under the reserved 0.1.5 so the build's end asks its publish", res.built)
|
||||
want := "0.1.5"
|
||||
if c.standing {
|
||||
want = "0.1.17"
|
||||
}
|
||||
if _, ok := res.built[want]; !ok || len(res.reserved) != 1 {
|
||||
t.Fatalf("built %v after %d reservations; want the digests recorded under the freshly reserved %s so the build's end asks its publish", res.built, len(res.reserved), want)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@@ -659,10 +659,9 @@ func (b *Builder) try(ctx context.Context, module string, m meshcatalog.ModulesB
|
||||
var reserved versions.ReservedVersion
|
||||
hasReserved := false
|
||||
if rebuild && cl.Build.State == builds.BuildBuilding {
|
||||
// The standing reservation of this fingerprint is kept, else one is made; its build's own publish then runs.
|
||||
if cur, ok, rerr := b.Reserved.ReservedFor(ctx, module, m.Fp2); rerr == nil && ok {
|
||||
reserved, hasReserved = cur, true
|
||||
} else if b.Reserved.Filled() {
|
||||
// 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))
|
||||
}
|
||||
reserving = true
|
||||
|
||||
Reference in New Issue
Block a user