Indexer: a pin names a released version only, never a reservation (H-A-495)
Importers were pinned to mesh-delivery-contracts 0.1.82 to 0.1.84, reserved by
builds a competing build withdrew before release and never published, so their
builds failed "unknown revision". The series' numbered version a reservation
writes no longer pins: a pin is the series' newest released version, so a
version-reserved moves no pin and the release's re-pin moves the importers. A
pin held on a version never released is moved at the next take-in or re-pin and
said per module ("<module>: pinned to <pkg> <v>, never released; moved to <v2>").
Builds: design 47 H2 H-A-495 and its addendum (hq 9e0923ce)
This commit is contained in:
@@ -101,9 +101,10 @@ func TestAReleaseRepinsAnEntryNamingItsPackageWithNoPin(t *testing.T) {
|
||||
t.Errorf("said %+v, want catalog-revision of each branch with the release's call", said)
|
||||
}
|
||||
|
||||
// Design 47 H2 §805, H-A-418, H-A-420, H-A-424, H-A-436: a pipeline reserving twenty packages of mesh-sdk in main's
|
||||
// revision 2 keeps one re-pin revision of main when its gathering settles, at its first step-ended; its release then
|
||||
// keeps none on main, and a pipeline that did not pass withdraws its reservations back to the newest released version.
|
||||
// Design 47 H2 H-A-495 (ending H-A-418 (2), H-A-424 (4)), H-A-436: a pin names only a released version. A pipeline
|
||||
// reserving twenty packages of mesh-sdk in main's revision 2 moves no pin when its gathering settles; the release of
|
||||
// the reserved version re-pins g in one revision; a pipeline that did not pass withdraws its reservations and moves
|
||||
// nothing; and a pin held on a version never released is moved to the newest released at the next re-pin, said.
|
||||
ix.Files = func(_ context.Context, _, _ string, dirs []string) (map[string]map[string]string, error) {
|
||||
out := map[string]map[string]string{}
|
||||
for _, d := range dirs {
|
||||
@@ -111,6 +112,8 @@ func TestAReleaseRepinsAnEntryNamingItsPackageWithNoPin(t *testing.T) {
|
||||
}
|
||||
return out, nil
|
||||
}
|
||||
var lines []string
|
||||
ix.Logf = func(format string, args ...any) { lines = append(lines, fmt.Sprintf(format, args...)) }
|
||||
heard := newMem()
|
||||
ix.Heard = heard
|
||||
revision := BranchObject("main", 2)
|
||||
@@ -121,6 +124,7 @@ func TestAReleaseRepinsAnEntryNamingItsPackageWithNoPin(t *testing.T) {
|
||||
}
|
||||
return rev.Revision
|
||||
}
|
||||
const sdkGo = "git.novox.be/novox/mesh-sdk/go"
|
||||
for i := range 20 {
|
||||
e := meshbuilds.VersionReservedEvent{Module: "mesh-sdk", Artifact: fmt.Sprintf("mesh-sdk:p%d", i), Path: "mesh-sdk/go", Version: "0.1.28", Revision: revision}
|
||||
if err := ix.HearVersionReserved(ctx, e); err != nil {
|
||||
@@ -130,44 +134,57 @@ func TestAReleaseRepinsAnEntryNamingItsPackageWithNoPin(t *testing.T) {
|
||||
if _, _, open, _ := heard.Get(ctx, SettlingKey(revision)); !open || newest() != 2 {
|
||||
t.Fatalf("twenty reservations: gathering open %v, main's newest %d, want open and no revision kept before it settles", open, newest())
|
||||
}
|
||||
if err := ix.Settle(ctx, revision); err != nil || newest() != 3 {
|
||||
t.Fatalf("the gathering settled (%v) keeping main's newest %d, want one re-pin revision, 3", err, newest())
|
||||
if err := ix.Settle(ctx, revision); err != nil || newest() != 2 {
|
||||
t.Fatalf("the gathering settled (%v) keeping main's newest %d, want still 2: a reservation moves no pin", err, newest())
|
||||
}
|
||||
if now, _ := moduleOf(t, mods, "g"); now.Packages["git.novox.be/novox/mesh-sdk/go"] != "v0.1.28" {
|
||||
t.Errorf("g after the reservations is pinned %v, want v0.1.28", now.Packages)
|
||||
if now, _ := moduleOf(t, mods, "g"); now.Packages[sdkGo] != "v0.1.27" {
|
||||
t.Errorf("g after the reservations is pinned %v, want the released v0.1.27", now.Packages)
|
||||
}
|
||||
if err := ix.Settle(ctx, revision); err != nil || newest() != 3 {
|
||||
t.Errorf("a second step-ended settled (%v) keeping main's newest %d, want still 3", err, newest())
|
||||
}
|
||||
if _, err := ix.HearVersion(ctx, HeardVersion{Package: "mesh-sdk/go", GoModule: "git.novox.be/novox/mesh-sdk/go", Version: "0.1.28", Commit: strings.Repeat("1", 40), Published: true}); err != nil {
|
||||
if _, err := ix.HearVersion(ctx, HeardVersion{Package: "mesh-sdk/go", GoModule: sdkGo, Version: "0.1.28", Commit: strings.Repeat("1", 40), Published: true}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err := ix.Repin(ctx, "mesh-sdk", "0.1.28"); err != nil || newest() != 3 {
|
||||
t.Errorf("the release of the reserved 0.1.28 re-pinned (%v) keeping main's newest %d, want no revision more", err, newest())
|
||||
t.Errorf("the release of the reserved 0.1.28 re-pinned (%v) keeping main's newest %d, want one revision more, 3", err, newest())
|
||||
}
|
||||
if now, _ := moduleOf(t, mods, "g"); now.Packages[sdkGo] != "v0.1.28" {
|
||||
t.Errorf("g after the release is pinned %v, want v0.1.28", now.Packages)
|
||||
}
|
||||
next := BranchObject("main", 3)
|
||||
if err := ix.HearVersionReserved(ctx, meshbuilds.VersionReservedEvent{Module: "mesh-sdk", Artifact: "mesh-sdk:p0", Path: "mesh-sdk/go", Version: "0.1.29", Revision: next}); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := ix.Settle(ctx, next); err != nil || newest() != 4 {
|
||||
t.Fatalf("the reservation of 0.1.29 settled (%v) keeping main's newest %d, want 4", err, newest())
|
||||
if err := ix.Settle(ctx, next); err != nil || newest() != 3 {
|
||||
t.Fatalf("the reservation of 0.1.29 settled (%v) keeping main's newest %d, want still 3", err, newest())
|
||||
}
|
||||
// H-A-479 second addendum: a pipeline at the same revision whose movers are others withdraws none of mesh-sdk's.
|
||||
if err := ix.Withdraw(ctx, "main", 3, []string{"app"}); err != nil || newest() != 4 {
|
||||
t.Fatalf("another pipeline's withdrawal (%v) kept main's newest %d, want 4: nothing of mesh-sdk withdrawn", err, newest())
|
||||
if err := ix.Withdraw(ctx, "main", 3, []string{"app"}); err != nil || newest() != 3 {
|
||||
t.Fatalf("another pipeline's withdrawal (%v) kept main's newest %d, want 3: nothing of mesh-sdk withdrawn", err, newest())
|
||||
}
|
||||
if _, _, kept, _ := heard.Get(ctx, ReservedKey(next, "mesh-sdk")); !kept {
|
||||
t.Fatalf("another pipeline's withdrawal took mesh-sdk's reservation")
|
||||
}
|
||||
if err := ix.Withdraw(ctx, "main", 3, []string{"mesh-sdk"}); err != nil || newest() != 5 {
|
||||
t.Fatalf("the withdrawal (%v) kept main's newest %d, want 5", err, newest())
|
||||
if err := ix.Withdraw(ctx, "main", 3, []string{"mesh-sdk"}); err != nil || newest() != 3 {
|
||||
t.Fatalf("the withdrawal (%v) kept main's newest %d, want 3: the withdrawn reservation pinned nothing", err, newest())
|
||||
}
|
||||
if now, _ := moduleOf(t, mods, "g"); now.Packages["git.novox.be/novox/mesh-sdk/go"] != "v0.1.28" {
|
||||
if now, _ := moduleOf(t, mods, "g"); now.Packages[sdkGo] != "v0.1.28" {
|
||||
t.Errorf("g after the withdrawal is pinned %v, want the newest released v0.1.28", now.Packages)
|
||||
}
|
||||
if _, _, kept, _ := heard.Get(ctx, ReservedKey(next, "mesh-sdk")); kept {
|
||||
t.Errorf("the withdrawn reservation is still kept")
|
||||
}
|
||||
stale, _ := moduleOf(t, mods, "g")
|
||||
stale.Packages = map[string]string{sdkGo: "v0.1.29"} // pinned before H-A-495 to the withdrawn reservation
|
||||
mods.put("g", mustEncode(t, stale))
|
||||
lines = nil
|
||||
if _, err := ix.Repin(ctx, "mesh-sdk", "0.1.28"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if now, _ := moduleOf(t, mods, "g"); now.Packages[sdkGo] != "v0.1.28" {
|
||||
t.Errorf("g pinned to the never released v0.1.29 is pinned %v after a re-pin, want v0.1.28", now.Packages)
|
||||
}
|
||||
if said := "g: pinned to " + sdkGo + " v0.1.29, never released; moved to v0.1.28"; !slices.Contains(lines, said) {
|
||||
t.Errorf("the re-pin said %q, want the line %q", lines, said)
|
||||
}
|
||||
// H-A-479 second addendum: two pipelines' movers reserve at one revision while its gathering is open; withdrawing one
|
||||
// pipeline's mover keeps the gathering and the other's reservation, withdrawing the last removes the gathering too.
|
||||
six := BranchObject("main", 6)
|
||||
|
||||
@@ -17,13 +17,13 @@ import (
|
||||
|
||||
// A release re-pins once, at its reservation (design 47 H2 §805; H-A-418, H-A-420, H-A-424). The builder says
|
||||
// version-reserved when it reserves a package's number, naming the revision `<branch>.<n>` its pipeline runs. The indexer
|
||||
// writes the series' numbered version with the contents read at the commit of the module's entry in that revision, so
|
||||
// acceptedSeries and releasedPins pin it, and keeps the reservation in its state heard under
|
||||
// writes the series' numbered version with the contents read at the commit of the module's entry in that revision, and
|
||||
// keeps the reservation in its state heard under
|
||||
// `reserved.<revision>.<module>`, each key living reserved-keep. It gathers a pipeline's reservations per revision and
|
||||
// writes one re-pin revision of that revision's branch when the gathering settles: at the first pipeline-started or
|
||||
// step-ended of that pipeline heard after them, or at the expiry of the key settling.<revision>, written reserved-settle
|
||||
// after the first. The release's package-published then
|
||||
// moves no fingerprint. A pipeline-ended not passed whose revision holds reservations withdraws them: the series'
|
||||
// after the first. A pin names only a released version, never a reservation (design 47 H2 H-A-495), so that re-pin
|
||||
// moves no pin, and the release's re-pin (H-A-165) moves the importers. A pipeline-ended not passed whose revision holds reservations withdraws them: the series'
|
||||
// numbered goes back to its newest released version and the importers are re-pinned to it.
|
||||
|
||||
// ReservedPrefix begins every key of the state heard holding a revision's reservations of one module.
|
||||
|
||||
@@ -198,14 +198,10 @@ func acceptedSeries(series map[string]SeriesPackage, m catalogue.Manifest, repos
|
||||
return out, pins
|
||||
}
|
||||
|
||||
// pinnedVersion is the version of a series its users are pinned to: its numbered one when a reservation wrote it with its
|
||||
// contents and it is newer than the newest released (design 47 H2 §805, H-A-418 (2), H-A-424 (4)), else the newest; nil
|
||||
// for none.
|
||||
// pinnedVersion is the version of a series its users are pinned to: its newest released one, never a reservation's
|
||||
// numbered one, which a pipeline that does not pass withdraws unpublished (design 47 H2 H-A-495, which ends H-A-418 (2)
|
||||
// and H-A-424 (4)); nil for none.
|
||||
func pinnedVersion(s SeriesPackage) *SeriesVersion {
|
||||
if n := s.Numbered; n != nil && n.Contents != nil && (s.Newest == nil || CompareVersions("v"+s.Newest.Version, "v"+n.Version) < 0) {
|
||||
p := publishedOfNumbered(*n.Contents)
|
||||
return &SeriesVersion{Version: n.Version, Commit: n.Commit, Digest: n.Digest, Fingerprint: n.Fingerprint, Contents: contentsOfPublished(p)}
|
||||
}
|
||||
return s.Newest
|
||||
}
|
||||
|
||||
|
||||
@@ -236,6 +236,7 @@ func (ix *Indexer) recomputeLocked(ctx context.Context, overlay map[string]meshc
|
||||
fp, none string
|
||||
tcs map[string]meshcatalog.ToolchainUsed // by language, when there is a fingerprint
|
||||
pkgs sdkstep.PackageVersions // the package versions, when there is a fingerprint
|
||||
moved []string // the pins moved off a version never released, said (H-A-495)
|
||||
}
|
||||
done := map[string]result{}
|
||||
visiting := map[string]bool{}
|
||||
@@ -313,6 +314,7 @@ func (ix *Indexer) recomputeLocked(ctx context.Context, overlay map[string]meshc
|
||||
// a pin is a released version, never a commit (H-A-161), and the version line's fingerprint takes it (H-A-167)
|
||||
r.fp, r.pkgs = pinnedOf(f, series, k.manifest, k.cur.Repository, kept.Packages)
|
||||
r.tcs = toolchainsUsed(toolchains)
|
||||
r.moved = neverReleased(module, k.held.Packages, r.pkgs, series, k.manifest)
|
||||
}
|
||||
}
|
||||
if _, merged := overlay[module]; !merged && (repository != "" && !trunk.SameRepository(k.cur.Repository, repository) &&
|
||||
@@ -325,6 +327,9 @@ func (ix *Indexer) recomputeLocked(ctx context.Context, overlay map[string]meshc
|
||||
}
|
||||
done[module] = r
|
||||
k.cur.Inputs2 = &kept
|
||||
for _, line := range r.moved {
|
||||
ix.logf("%s", line)
|
||||
}
|
||||
return r
|
||||
}
|
||||
finals := map[string]meshcatalog.ModulesByModuleValue{}
|
||||
|
||||
@@ -423,6 +423,29 @@ func pinnedOf(f form, series map[string]SeriesPackage, m catalogue.Manifest, rep
|
||||
return fingerprint.WithPins(f.fp, pins), pins
|
||||
}
|
||||
|
||||
// neverReleased are the lines said of a module whose held pins (was) name a version above its series' newest released one,
|
||||
// a reservation withdrawn unpublished, and whose new pins move it (design 47 H2 H-A-495): "<module>: pinned to <package>
|
||||
// <version>, never released; moved to <version>". nil for none.
|
||||
func neverReleased(module string, was map[string]string, pins sdkstep.PackageVersions, series map[string]SeriesPackage, m catalogue.Manifest) []string {
|
||||
var out []string
|
||||
for _, p := range slices.Sorted(maps.Keys(was)) {
|
||||
old, now := strings.TrimPrefix(was[p], "v"), pins[p]
|
||||
if _, ok := versionParts(old); !ok || was[p] == now {
|
||||
continue
|
||||
}
|
||||
for _, s := range series {
|
||||
if s.GoModule != p || s.Newest == nil || s.Series != m.AcceptedSeries(s.Name) {
|
||||
continue
|
||||
}
|
||||
if in, _ := SeriesOf(old); in == s.Series && compareVersions(old, strings.TrimPrefix(s.Newest.Version, "v")) > 0 {
|
||||
out = append(out, fmt.Sprintf("%s: pinned to %s %s, never released; moved to %s", module, p, was[p], cmp.Or(now, "no version")))
|
||||
}
|
||||
break
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// moduleOfKey is the module a modules key names; "" for none.
|
||||
func moduleOfKey(key string) string {
|
||||
if key == "" {
|
||||
|
||||
Reference in New Issue
Block a user