mesh-delivery-indexer: a version-released re-pins the modules holding the package
Pins moved to a new released version only at the next merge, toolchain report or hand recompute. The release now starts the pass of H-A-161 for the modules whose packages hold a package of the released module alone; every other module stands as held. Builds: design 47 H H-A-165 (the indexer's part), H-A-161
This commit is contained in:
@@ -16,6 +16,7 @@ import (
|
|||||||
"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk"
|
"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-sdk/trunk"
|
||||||
"git.novox.be/novox/mesh-sdk/go/catalogue"
|
"git.novox.be/novox/mesh-sdk/go/catalogue"
|
||||||
|
|
||||||
|
"mesh-delivery-indexer/internal/fingerprint"
|
||||||
"mesh-delivery-indexer/judge"
|
"mesh-delivery-indexer/judge"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -152,11 +153,13 @@ func (ix *Indexer) recomputeModules(ctx context.Context, overlay map[string]mesh
|
|||||||
}
|
}
|
||||||
ix.recompute.Lock()
|
ix.recompute.Lock()
|
||||||
defer ix.recompute.Unlock()
|
defer ix.recompute.Unlock()
|
||||||
return ix.recomputeLocked(ctx, overlay, w, repository)
|
return ix.recomputeLocked(ctx, overlay, w, repository, nil)
|
||||||
}
|
}
|
||||||
|
|
||||||
// recomputeLocked is recomputeModules with ix.recompute held by the caller (a hold that moves, holds.go).
|
// recomputeLocked is recomputeModules with ix.recompute held by the caller (a hold that moves, holds.go).
|
||||||
func (ix *Indexer) recomputeLocked(ctx context.Context, overlay map[string]meshcatalog.ModulesByModuleValue, w *mergeWrite, repository string) error {
|
//
|
||||||
|
// only, when not nil, names the modules the pass moves (a re-pin, H-A-165): every other stands as held.
|
||||||
|
func (ix *Indexer) recomputeLocked(ctx context.Context, overlay map[string]meshcatalog.ModulesByModuleValue, w *mergeWrite, repository string, only map[string]bool) error {
|
||||||
if ix.Manifests == nil {
|
if ix.Manifests == nil {
|
||||||
return ix.writeOverlay(ctx, overlay, nil, w)
|
return ix.writeOverlay(ctx, overlay, nil, w)
|
||||||
}
|
}
|
||||||
@@ -299,8 +302,8 @@ func (ix *Indexer) recomputeLocked(ctx context.Context, overlay map[string]meshc
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
r.pkgs = releasedPins(r.pkgs, held, released) // a pin is a released version, never a commit (H-A-161)
|
r.pkgs = releasedPins(r.pkgs, held, released) // a pin is a released version, never a commit (H-A-161)
|
||||||
if _, merged := overlay[module]; !merged && repository != "" && !trunk.SameRepository(k.cur.Repository, repository) &&
|
if _, merged := overlay[module]; !merged && (repository != "" && !trunk.SameRepository(k.cur.Repository, repository) &&
|
||||||
!importsOf(r.pkgs, repository) {
|
!importsOf(r.pkgs, repository) || only != nil && !only[module]) {
|
||||||
// A module registered for another repository is moved by this repository's commit only when it imports a package the
|
// A module registered for another repository is moved by this repository's commit only when it imports a package the
|
||||||
// commit moved (A-476a, ADR 0593 §3); any other stands as held (A-476 c), and so it is for a base of this repository's.
|
// commit moved (A-476a, ADR 0593 §3); any other stands as held (A-476 c), and so it is for a base of this repository's.
|
||||||
r = result{fp: k.held.Fp2, none: k.held.None2, tcs: k.held.Toolchains, pkgs: sdkstep.PackageVersions(k.held.Packages)}
|
r = result{fp: k.held.Fp2, none: k.held.None2, tcs: k.held.Toolchains, pkgs: sdkstep.PackageVersions(k.held.Packages)}
|
||||||
@@ -590,3 +593,30 @@ func importsOf(pkgs sdkstep.PackageVersions, repository string) bool {
|
|||||||
}
|
}
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Repin moves the pins of every module whose packages hold a package of module (a held module's directory holds it) to
|
||||||
|
// module's newest released version, the pass of H-A-161 for those modules alone: a version-released of module starts it
|
||||||
|
// (design 47 H-A-165), so pins move on the event and never wait for a merge or a hand act. It answers how many it named.
|
||||||
|
func (ix *Indexer) Repin(ctx context.Context, module string) (int, error) {
|
||||||
|
if ix.Modules == nil || ix.Manifests == nil {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
held, err := ix.heldModules(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return 0, err
|
||||||
|
}
|
||||||
|
only := map[string]bool{}
|
||||||
|
for key, m := range held {
|
||||||
|
for p := range m.Packages {
|
||||||
|
if moduleOfKey(fingerprint.HolderOf(p, held)) == module {
|
||||||
|
only[key] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if len(only) == 0 {
|
||||||
|
return 0, nil
|
||||||
|
}
|
||||||
|
ix.recompute.Lock()
|
||||||
|
defer ix.recompute.Unlock()
|
||||||
|
return len(only), ix.recomputeLocked(ctx, nil, nil, "", only)
|
||||||
|
}
|
||||||
|
|||||||
@@ -786,6 +786,16 @@ func TestAModuleKeepsTheToolchainsItsFingerprintWasComputedWith(t *testing.T) {
|
|||||||
ix.Versions = newMem()
|
ix.Versions = newMem()
|
||||||
ix.Versions.(*memStore).put(meshcatalog.VersionsByModuleVersionKey("mesh-sdk", "0.1.20"), []byte(`{}`))
|
ix.Versions.(*memStore).put(meshcatalog.VersionsByModuleVersionKey("mesh-sdk", "0.1.20"), []byte(`{}`))
|
||||||
ix.Versions.(*memStore).put(meshcatalog.VersionsByModuleVersionKey("mesh-sdk", "0.1.9"), []byte(`{}`))
|
ix.Versions.(*memStore).put(meshcatalog.VersionsByModuleVersionKey("mesh-sdk", "0.1.9"), []byte(`{}`))
|
||||||
|
// mesh-sdk's release re-pins avahi with no merge, and leaves mesh-tools, which holds none of it (H-A-165).
|
||||||
|
if n, err := ix.Repin(context.Background(), "mesh-sdk"); err != nil || n != 1 {
|
||||||
|
t.Fatalf("re-pin on mesh-sdk's release: %d modules, %v; want avahi alone", n, err)
|
||||||
|
}
|
||||||
|
if a, _ := moduleOf(t, mods, "avahi"); a.Fp2 != first.Fp2 || !reflect.DeepEqual(a.Packages, map[string]string{sdk: "v0.1.20"}) {
|
||||||
|
t.Fatalf("after mesh-sdk's release: fp2 %q (was %q) packages %v, want the same fingerprint pinned to v0.1.20", a.Fp2, first.Fp2, a.Packages)
|
||||||
|
}
|
||||||
|
if o, _ := moduleOf(t, mods, "mesh-tools"); o.Fp2 != tools.Fp2 {
|
||||||
|
t.Errorf("a re-pin moved mesh-tools, which holds no package of mesh-sdk: %q (was %q)", o.Fp2, tools.Fp2)
|
||||||
|
}
|
||||||
second := sdkMerge(strings.Repeat("2", 40), "tree-sdk-2", "v0.1.20")
|
second := sdkMerge(strings.Repeat("2", 40), "tree-sdk-2", "v0.1.20")
|
||||||
if second.Fp2 == first.Fp2 {
|
if second.Fp2 == first.Fp2 {
|
||||||
t.Errorf("a mesh-sdk trunk merge kept avahi's fingerprint %q", first.Fp2)
|
t.Errorf("a mesh-sdk trunk merge kept avahi's fingerprint %q", first.Fp2)
|
||||||
|
|||||||
@@ -238,6 +238,13 @@ func (ix *Indexer) releaseVersion(ctx context.Context, p meshbuilds.PackagePubli
|
|||||||
}
|
}
|
||||||
ix.logf("versions: %s %s is released and version-released is said (%d artifacts, source %d)", p.Module, p.Version, len(v.Artifacts), v.Source)
|
ix.logf("versions: %s %s is released and version-released is said (%d artifacts, source %d)", p.Module, p.Version, len(v.Artifacts), v.Source)
|
||||||
}
|
}
|
||||||
|
if !late { // the release re-pins every module whose packages hold one of it (design 47 H-A-165)
|
||||||
|
if n, err := ix.Repin(ctx, p.Module); err != nil {
|
||||||
|
ix.logf("versions: the modules pinned to %s are not re-pinned to %s: %v", p.Module, p.Version, err)
|
||||||
|
} else if n > 0 {
|
||||||
|
ix.logf("versions: %d modules re-pinned to %s %s", n, p.Module, p.Version)
|
||||||
|
}
|
||||||
|
}
|
||||||
if err := ix.trimVersions(ctx, p.Module); err != nil {
|
if err := ix.trimVersions(ctx, p.Module); err != nil {
|
||||||
ix.logf("versions: %s's oldest versions are not deleted: %v", p.Module, err)
|
ix.logf("versions: %s's oldest versions are not deleted: %v", p.Module, err)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user