diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go index 0ca00286..2d160479 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/pipelines.go @@ -169,7 +169,7 @@ func (e *pipelineEnds) take(p mpr.PipelineEnded) (bool, error) { changed := false var kept []tierMover defer func() { - if err := e.startTiers(p.Pipeline, kept); err != nil { + if err := e.startTiers(p.Pipeline, p.Source, kept); err != nil { e.logf("the tier progress of %s is not written: %v", p.Pipeline, err) } }() diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers.go index 5211d564..5c45c24f 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers.go @@ -42,11 +42,14 @@ type tierMover struct { Tier int64 `json:"tier"` } -// tierProgress is a pipeline's tier progress (H-A-56): the tier whose wants are written, since when, and the movers. +// tierProgress is a pipeline's tier progress (H-A-56): the tier whose wants are written, since when, the movers, and the source +// revision its pipeline-ended names, said in pipeline-wanted beside the key's revision (design 47 H-A-214, H-A-216); zero in a +// value kept before the field, read as the key's number. type tierProgress struct { Tier int64 `json:"tier"` Since time.Time `json:"since"` Movers []tierMover `json:"movers"` + Source int64 `json:"source,omitempty"` } // tierKey is the key of pipeline's tier progress; pipeline is the runner's key `.`, its branch escaped. @@ -60,7 +63,7 @@ func isTierKey(key string) bool { // startTiers writes the tier progress of a passed pipeline whose movers' versions are now kept, its first tier the lowest of // theirs, since now. A pipeline heard again writes nothing. -func (e *pipelineEnds) startTiers(pipeline string, movers []tierMover) error { +func (e *pipelineEnds) startTiers(pipeline string, source int64, movers []tierMover) error { if len(movers) == 0 { return nil } @@ -68,7 +71,7 @@ func (e *pipelineEnds) startTiers(pipeline string, movers []tierMover) error { for _, m := range movers { first = min(first, m.Tier) } - value, err := json.Marshal(tierProgress{Tier: first, Since: e.clock().UTC(), Movers: movers}) + value, err := json.Marshal(tierProgress{Tier: first, Since: e.clock().UTC(), Movers: movers, Source: source}) if err != nil { return err } @@ -131,7 +134,7 @@ func (p *passer) tiers(n assign.Nodes, placedOn func(module, branch string) []st continue } pipeline := strings.TrimPrefix(key, tierPrefix) - branchEsc, source, _ := strings.Cut(pipeline, ".") + branchEsc, number, _ := strings.Cut(pipeline, ".") branch, err := keys.UnescapeName(branchEsc) if err != nil { continue @@ -144,7 +147,7 @@ func (p *passer) tiers(n assign.Nodes, placedOn func(module, branch string) []st notRunning := p.notRunning(n, placedOn, pipeline, branch, t, t.Tier) late := !now.Before(t.Since.Add(bound)) if late { - p.tierLate(pipeline, branch, source, t, notRunning) + p.tierLate(pipeline, branch, number, t, notRunning) break } if len(notRunning) > 0 { @@ -165,10 +168,10 @@ func (p *passer) tiers(n assign.Nodes, placedOn func(module, branch string) []st p.logf("the tier progress %s is not deleted: %v", key, err) break } - p.sayPipelineWanted(pipeline, branch, source, meshwants.PipelineWantedOutcomeRunning, nil) + p.sayPipelineWanted(pipeline, branch, number, t.Source, meshwants.PipelineWantedOutcomeRunning, nil) break } - value, err := json.Marshal(tierProgress{Tier: later, Since: now, Movers: t.Movers}) + value, err := json.Marshal(tierProgress{Tier: later, Since: now, Movers: t.Movers, Source: t.Source}) if err == nil { err = p.ends.st.swap(key, value, rev) } @@ -217,7 +220,7 @@ func (p *passer) notRunning(n assign.Nodes, placedOn func(module, branch string) // tierLate ends a pipeline's delivery at a tier past tier-bound: the finding tier-late is raised and pipeline-wanted says tier-late, // once each; the finding clears once the late movers run or a later pipeline moved them. The progress stays, so no later tier is // written, until no later tier's mover is kept at this pipeline any more. -func (p *passer) tierLate(pipeline, branch, source string, t tierProgress, notRunning []meshwants.NotRunning) { +func (p *passer) tierLate(pipeline, branch, number string, t tierProgress, notRunning []meshwants.NotRunning) { o := tierLateFinding(pipeline, t.Tier, notRunning) key := views.FindingKey(o.Scope, assign.KeyID(o.ID), o.Kind) if len(notRunning) > 0 { @@ -231,7 +234,7 @@ func (p *passer) tierLate(pipeline, branch, source string, t tierProgress, notRu p.said[key+".raised"] = true delete(p.said, key+".cleared") p.logf("pipeline %s: tier %d is late (tier-bound %s): %s; no later tier is written", pipeline, t.Tier, p.tierBoundOf(), o.Summary) - p.sayPipelineWanted(pipeline, branch, source, meshwants.PipelineWantedOutcomeTierLate, notRunning) + p.sayPipelineWanted(pipeline, branch, number, t.Source, meshwants.PipelineWantedOutcomeTierLate, notRunning) } } else if !p.said[key+".cleared"] { if p.findings.Delete != nil { @@ -271,11 +274,16 @@ func tierLateFinding(pipeline string, tier int64, notRunning []meshwants.NotRunn Source: "assigner." + kindTierLate} } -// sayPipelineWanted says the seat mesh-wants' pipeline-wanted of pipeline, once (its id the pipeline and the outcome). -func (p *passer) sayPipelineWanted(pipeline, branch, source, outcome string, notRunning []meshwants.NotRunning) { - var src int64 - _, _ = fmt.Sscan(source, &src) - body := meshwants.PipelineWantedEvent{V: keys.Version, Pipeline: pipeline, Branch: branch, Source: src, Outcome: outcome, NotRunning: notRunning} +// sayPipelineWanted says the seat mesh-wants' pipeline-wanted of pipeline, once (its id the pipeline and the outcome): its +// revision the number of the pipeline's key `.`, its source the one the pipeline-ended named (design 47 +// H-A-214, H-A-216), the key's number for a progress kept before it held one. +func (p *passer) sayPipelineWanted(pipeline, branch, number string, source int64, outcome string, notRunning []meshwants.NotRunning) { + var revision int64 + _, _ = fmt.Sscan(number, &revision) + if source <= 0 { + source = revision + } + body := meshwants.PipelineWantedEvent{V: keys.Version, Pipeline: pipeline, Branch: branch, Source: source, Revision: revision, Outcome: outcome, NotRunning: notRunning} event := meshwants.EventPipelineWanted + "." + pipeline if err := p.wantsSay(event, body, "pipeline-wanted."+pipeline+"."+outcome); err != nil { p.logf("pipeline-wanted of %s is not said: %v", pipeline, err) diff --git a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers_test.go b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers_test.go index 39d9bb39..9937f775 100644 --- a/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers_test.go +++ b/modules/mesh-delivery-assigner/cmd/mesh-delivery-assigner/tiers_test.go @@ -62,8 +62,11 @@ func TestAPipelinesWantsAreWrittenTierByTier(t *testing.T) { p.w.mu.Unlock() p.ends = newPipelineEnds(newMemEnds(), func() {}, t.Logf) p.ends.trunk, p.ends.now = p.w.trunkName, func() time.Time { return now } - if _, err := p.ends.take(ended(trunkBranch, 5, mpr.PipelineEndedOutcomePassed, mover("db", db, "0.2.0", 1, mpr.StepResultOutcomePassed), - mover("web", web, "0.1.2", 2, mpr.StepResultOutcomePassed))); err != nil { + // The pipeline of revision 5 (its key's number) of source 4: a re-pin's revision (H-A-213, H-A-216). + e := ended(trunkBranch, 5, mpr.PipelineEndedOutcomePassed, mover("db", db, "0.2.0", 1, mpr.StepResultOutcomePassed), + mover("web", web, "0.1.2", 2, mpr.StepResultOutcomePassed)) + e.Source = 4 + if _, err := p.ends.take(e); err != nil { t.Fatal(err) } wanted := func(node, module string) bool { @@ -88,7 +91,7 @@ func TestAPipelinesWantsAreWrittenTierByTier(t *testing.T) { raw, _ = json.Marshal(nodeengine.Running{Node: "g14", Module: "web", Fingerprint: web}) _ = p.w.hearRunning("running.g14.web", raw) p.wants(context.Background()) - if len(said) != 1 || said[0].Outcome != meshwants.PipelineWantedOutcomeRunning || len(findings) != 0 { + if len(said) != 1 || said[0].Outcome != meshwants.PipelineWantedOutcomeRunning || said[0].Revision != 5 || said[0].Source != 4 || len(findings) != 0 { t.Errorf("every tier runs: said %+v, findings %v", said, findings) } if _, _, ok := p.ends.tiersOf(trunkBranch + ".5"); ok { @@ -108,8 +111,14 @@ func TestAPipelinesWantsAreWrittenTierByTier(t *testing.T) { if !ok || !strings.Contains(f.Summary, "db on g14") || strings.Contains(f.Summary, "ace") { t.Errorf("tier-late is not raised naming db on g14 alone: %v", findings) } - if len(said) != 1 || said[0].Outcome != meshwants.PipelineWantedOutcomeTierLate || len(said[0].NotRunning) != 1 || said[0].NotRunning[0].Module != "db" { - t.Errorf("pipeline-wanted tier-late is not said once: %+v", said) + if len(said) != 1 || said[0].Outcome != meshwants.PipelineWantedOutcomeTierLate || len(said[0].NotRunning) != 1 || said[0].NotRunning[0].Module != "db" || + said[0].Revision != 5 || said[0].Source != 4 { + t.Errorf("pipeline-wanted tier-late is not said once, naming revision 5 of source 4: %+v", said) + } + // A tier progress kept before it held its source says the key's number as both (H-A-216). + p.sayPipelineWanted(trunkBranch+".5", trunkBranch, "5", 0, meshwants.PipelineWantedOutcomeRunning, nil) + if len(said) != 2 || said[1].Revision != 5 || said[1].Source != 5 { + t.Errorf("a progress with no source: said %+v, want revision and source 5", said) } if wanted("g14", "web") || wanted("ace", "web") { t.Error("a consumer's want is written after its provider's tier was late") diff --git a/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go b/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go index a4dc8aa9..44c5c076 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go +++ b/modules/mesh-delivery-contracts/go/seats/meshwants/contract.go @@ -1001,10 +1001,12 @@ type PipelineWanted struct { // for tier-late, the late tier's movers not running and the machines they do not run on NotRunning []NotRunning `json:"not-running,omitempty"` Outcome string `json:"outcome"` - // the runner's pipeline key, ., a branch escaped as a key's name is (design 47 H §746) + // the runner's pipeline key, ., a branch escaped as a key's name is (design 47 H §746, H-A-213 (4)) Pipeline string `json:"pipeline"` - Source int64 `json:"source"` - V int64 `json:"v"` + // the pipeline's catalog revision number, the number of its key; the indexer frees the pins of that revision, not of another revision of the same source (design 47 H-A-214); absent from an older event + Revision int64 `json:"revision,omitempty"` + Source int64 `json:"source"` + V int64 `json:"v"` } // The values of PipelineWanted's outcome. diff --git a/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go b/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go index daeed530..d623d162 100644 --- a/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go +++ b/modules/mesh-delivery-contracts/go/seats/meshwants/contract_test.go @@ -29,7 +29,7 @@ func TestFixtures(t *testing.T) { decode: func(b []byte) (any, error) { var v WantedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.wanted\\.[^.*> ]+\\.[^.*> ]+$")}, {name: "a want removed, its node left or its module unplaced", subject: "mesh.seat.mesh-wants.event.wanted.n1.xclip", given: "{\"at\":\"2026-11-09T19:05:00Z\",\"fp\":\"src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56\",\"module\":\"xclip\",\"node\":\"n1\",\"removed\":true,\"revision\":41,\"v\":1}", wire: "{\"at\":\"2026-11-09T19:05:00Z\",\"fp\":\"src2:b427bdde1f100e2f52490cfa9df0c5112dd3700226b4892349f0c14a15a4af56\",\"module\":\"xclip\",\"node\":\"n1\",\"removed\":true,\"revision\":41,\"v\":1}", decode: func(b []byte) (any, error) { var v WantedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.wanted\\.[^.*> ]+\\.[^.*> ]+$")}, - {name: "a pipeline's wants all run", subject: "mesh.seat.mesh-wants.event.pipeline-wanted.main.3589", given: "{\"branch\":\"main\",\"outcome\":\"running\",\"pipeline\":\"main.3589\",\"source\":3589,\"v\":1}", wire: "{\"branch\":\"main\",\"outcome\":\"running\",\"pipeline\":\"main.3589\",\"source\":3589,\"v\":1}", + {name: "a pipeline's wants all run", subject: "mesh.seat.mesh-wants.event.pipeline-wanted.main.3590", given: "{\"branch\":\"main\",\"outcome\":\"running\",\"pipeline\":\"main.3590\",\"revision\":3590,\"source\":3589,\"v\":1}", wire: "{\"branch\":\"main\",\"outcome\":\"running\",\"pipeline\":\"main.3590\",\"revision\":3590,\"source\":3589,\"v\":1}", decode: func(b []byte) (any, error) { var v PipelineWantedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.pipeline-wanted\\.[^.*> ]+\\.[^.*> ]+$")}, {name: "a pipeline's tier late, naming the movers and machines not running", subject: "mesh.seat.mesh-wants.event.pipeline-wanted.main.3590", given: "{\"branch\":\"main\",\"not-running\":[{\"machines\":[\"anchor\",\"laptop\"],\"module\":\"nats\"}],\"outcome\":\"tier-late\",\"pipeline\":\"main.3590\",\"source\":3590,\"v\":1}", wire: "{\"branch\":\"main\",\"not-running\":[{\"machines\":[\"anchor\",\"laptop\"],\"module\":\"nats\"}],\"outcome\":\"tier-late\",\"pipeline\":\"main.3590\",\"source\":3590,\"v\":1}", decode: func(b []byte) (any, error) { var v PipelineWantedEvent; err := json.Unmarshal(b, &v); return v, err }, subjectIs: regexp.MustCompile("^mesh\\.seat\\.mesh-wants\\.event\\.pipeline-wanted\\.[^.*> ]+\\.[^.*> ]+$")}, diff --git a/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json index feeace4e..3381500a 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json +++ b/modules/mesh-delivery-contracts/seats/mesh-wants/fixtures/events.json @@ -65,12 +65,13 @@ { "name": "a pipeline's wants all run", "of": "event:pipeline-wanted", - "subject": "mesh.seat.mesh-wants.event.pipeline-wanted.main.3589", + "subject": "mesh.seat.mesh-wants.event.pipeline-wanted.main.3590", "given": { "v": 1, - "pipeline": "main.3589", + "pipeline": "main.3590", "branch": "main", "source": 3589, + "revision": 3590, "outcome": "running" } }, diff --git a/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json b/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json index f09ae1f9..e55cf587 100644 --- a/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json +++ b/modules/mesh-delivery-contracts/seats/mesh-wants/seat.json @@ -1725,7 +1725,7 @@ }, "pipeline": { "type": "string", - "description": "the runner's pipeline key, ., a branch escaped as a key's name is (design 47 H §746)" + "description": "the runner's pipeline key, ., a branch escaped as a key's name is (design 47 H §746, H-A-213 (4))" }, "branch": { "type": "string" @@ -1733,6 +1733,10 @@ "source": { "type": "integer" }, + "revision": { + "type": "integer", + "description": "the pipeline's catalog revision number, the number of its key; the indexer frees the pins of that revision, not of another revision of the same source (design 47 H-A-214); absent from an older event" + }, "outcome": { "type": "string", "enum": [ diff --git a/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts index 0b53c871..e7bf8b47 100644 --- a/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts +++ b/modules/mesh-delivery-contracts/ts/seats/meshwants/index.d.ts @@ -412,8 +412,10 @@ export interface PipelineWanted { /** for tier-late, the late tier's movers not running and the machines they do not run on */ "not-running"?: NotRunning[]; "outcome": "running" | "tier-late"; - /** the runner's pipeline key, ., a branch escaped as a key's name is (design 47 H §746) */ + /** the runner's pipeline key, ., a branch escaped as a key's name is (design 47 H §746, H-A-213 (4)) */ "pipeline": string; + /** the pipeline's catalog revision number, the number of its key; the indexer frees the pins of that revision, not of another revision of the same source (design 47 H-A-214); absent from an older event */ + "revision"?: number; "source": number; "v": number; } diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go index c57388a2..cc42bf67 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/named_test.go @@ -90,7 +90,7 @@ func TestTheTrunkIsTheDirectoriesTheForgeListsTrees(t *testing.T) { // 1900/AC3 }{ {name: "a run started", body: `{"v":1,"run":"7","members":[{"module":"a","commit":"c"}],"by":"s"}`, acked: 1, started: "7"}, {name: "a run's pipeline ended", body: `{"v":1,"pipeline":"p","module":"a","branch":"b","commit":"c","outcome":"passed","steps":[],"run":"7"}`, ended: true, acked: 1, endedOf: "7"}, - {name: "a pipeline's wants written to the end", body: `{"v":1,"pipeline":"main.12","branch":"main","source":12,"outcome":"tier-late"}`, wanted: true, acked: 1}, + {name: "a pipeline's wants written to the end", body: `{"v":1,"pipeline":"main.13","branch":"main","source":12,"revision":13,"outcome":"tier-late"}`, wanted: true, acked: 1}, {name: "not json", body: `nope`, termd: 1}, {name: "a run never taken in", body: `{"v":1,"run":"7","members":[]}`, err: fmt.Errorf("%w: no member", index.ErrUnreadable), termd: 1, started: "7"}, {name: "a bus fault", body: `{"v":1,"run":"7","members":[{"module":"a","commit":"c"}]}`, err: errors.New("the bus did not answer"), started: "7"}, @@ -100,8 +100,8 @@ func TestTheTrunkIsTheDirectoriesTheForgeListsTrees(t *testing.T) { // 1900/AC3 switch { case row.wanted: heardPipelineWanted(context.Background(), ix, m, t.Logf) - if ix.wanted != "main.12 tier-late" { - t.Errorf("%s: was handed %q, want main.12 tier-late", row.name, ix.wanted) + if ix.wanted != "main.12.13 tier-late" { // its revision handed beside its source (H-A-214) + t.Errorf("%s: was handed %q, want main.12.13 tier-late", row.name, ix.wanted) } case row.ended: heardPipelineEnded(context.Background(), ix, m, t.Logf) @@ -169,8 +169,11 @@ func (f *fakeRuns) HeardPins(context.Context, *meshpipelinerunner.PipelineStarte return nil } -func (f *fakeRuns) HeardPipelineWanted(_ context.Context, branch string, source int64, outcome string) error { +func (f *fakeRuns) HeardPipelineWanted(_ context.Context, branch string, source, revision int64, outcome string) error { f.wanted = fmt.Sprintf("%s.%d %s", branch, source, outcome) + if revision > 0 { + f.wanted = fmt.Sprintf("%s.%d.%d %s", branch, source, revision, outcome) + } return f.err } diff --git a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/runs.go b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/runs.go index fdbf67aa..1c095858 100644 --- a/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/runs.go +++ b/modules/mesh-delivery-indexer/cmd/mesh-delivery-indexer/runs.go @@ -21,7 +21,7 @@ type runTaker interface { StartRun(ctx context.Context, e meshpipelinerunner.RunStarted) error EndRunPipeline(ctx context.Context, e meshpipelinerunner.PipelineEnded) error HeardPins(ctx context.Context, started *meshpipelinerunner.PipelineStarted, ended *meshpipelinerunner.PipelineEnded) error - HeardPipelineWanted(ctx context.Context, branch string, source int64, outcome string) error + HeardPipelineWanted(ctx context.Context, branch string, source, revision int64, outcome string) error JudgePins(ctx context.Context) } @@ -99,7 +99,7 @@ func heardPipelineWanted(ctx context.Context, ix runTaker, m delivered, logf fun _ = m.Term() return } - err := ix.HeardPipelineWanted(ctx, e.Branch, e.Source, e.Outcome) + err := ix.HeardPipelineWanted(ctx, e.Branch, e.Source, e.Revision, e.Outcome) settleRun(m, err, "pipeline-wanted of "+e.Pipeline, logf) if err == nil { ix.JudgePins(ctx) diff --git a/modules/mesh-delivery-indexer/internal/index/pins.go b/modules/mesh-delivery-indexer/internal/index/pins.go index 33816fa8..92a543d2 100644 --- a/modules/mesh-delivery-indexer/internal/index/pins.go +++ b/modules/mesh-delivery-indexer/internal/index/pins.go @@ -119,8 +119,9 @@ func ReleaseRecord(branch, module string) string { // every revision of the branch below it; a mover the revision holds no release of (superseded, no version released) keeps its // older release's revision. Outcome tier-late frees nothing: its later tiers' wants are not written, though their release // records are held, and the same pipeline's later running frees them. A pipeline whose revision is not kept frees nothing and -// says so; one applied twice changes nothing. -func (ix *Indexer) HeardPipelineWanted(ctx context.Context, branch string, source int64, outcome string) error { +// says so; one applied twice changes nothing. The pipeline's revision is the one the event names (design 47 H-A-214); an event +// naming none (revision zero, said before the field) is of the source's lowest-numbered revision, the take-in's. +func (ix *Indexer) HeardPipelineWanted(ctx context.Context, branch string, source, revision int64, outcome string) error { if ix.Pins == nil || ix.Revisions == nil { return errors.New("the indexer keeps no state " + PinsState) } @@ -128,12 +129,21 @@ func (ix *Indexer) HeardPipelineWanted(ctx context.Context, branch string, sourc ix.logf("pins: pipeline-wanted of %s %d is %s: it frees no release until its wants are written everywhere (H-A-174)", branch, source, outcome) return nil } - name, err := revisionOfSource(ctx, ix.Revisions, branch, source) - if err != nil { - ix.logf("pins: pipeline-wanted of %s %d frees no release: its revision is not kept: %v", branch, source, err) - return nil + var name string + if revision > 0 { + name = RevisionObject(meshcatalog.CatalogRevision{Branch: branch, Revision: revision}) + } else { + var err error + if name, err = revisionOfSource(ctx, ix.Revisions, branch, source); err != nil { + ix.logf("pins: pipeline-wanted of %s %d frees no release: its revision is not kept: %v", branch, source, err) + return nil + } } rev, _, err := ReadRevision(ctx, ix.Revisions, name) + if revision > 0 && errors.Is(err, ErrNoObject) { + ix.logf("pins: pipeline-wanted of %s revision %d frees no release: %s is not kept", branch, revision, name) + return nil + } if err != nil { return fmt.Errorf("%s: %w", name, err) } diff --git a/modules/mesh-delivery-indexer/internal/index/pins_test.go b/modules/mesh-delivery-indexer/internal/index/pins_test.go index 8f8a0389..c6de5147 100644 --- a/modules/mesh-delivery-indexer/internal/index/pins_test.go +++ b/modules/mesh-delivery-indexer/internal/index/pins_test.go @@ -106,18 +106,20 @@ func TestTheIndexerRemovesARevisionOnlyWhenNoRecordPinsItAndItIsNotCurrent(t *te t.Fatal(err) } } - end := func(source int64, outcome, version string) { + endOf := func(source, revision int64, outcome, version string) { t.Helper() - e := runner.PipelineEnded{Branch: "main", Pipeline: fmt.Sprintf("main.%d", source), Revision: source, Source: source, Outcome: outcome, + e := runner.PipelineEnded{Branch: "main", Pipeline: fmt.Sprintf("main.%d", revision), Revision: revision, Source: source, Outcome: outcome, Movers: []runner.MoverEnded{{Module: "reader", Fingerprint: "f", Version: version}}} if err := ix.HeardPins(ctx, nil, &e); err != nil { t.Fatal(err) } ix.JudgePins(ctx) } + end := func(source int64, outcome, version string) { t.Helper(); endOf(source, source, outcome, version) } + // An event naming no revision (said before the field) is of the source's lowest-numbered revision, the take-in's (H-A-214). wanted := func(source int64, outcome string) { t.Helper() - if err := ix.HeardPipelineWanted(ctx, "main", source, outcome); err != nil { + if err := ix.HeardPipelineWanted(ctx, "main", source, 0, outcome); err != nil { t.Fatal(err) } ix.JudgePins(ctx) @@ -142,6 +144,16 @@ func TestTheIndexerRemovesARevisionOnlyWhenNoRecordPinsItAndItIsNotCurrent(t *te if v, _, _, _ := ix.Pins.Get(ctx, "main.7"); !slices.Equal(mustRecords(t, v), []string{ReleaseRecord("main", "reader")}) { t.Errorf("the pin of main.7 holds %s, want its release alone", v) } + // H-A-214: a re-pin's revision 8 of the same source 7 releases 0.1.14; its pipeline-wanted names revision 8, so the release + // on revision 8 frees the older one on revision 7, which the source's lowest-numbered revision would not. + take(7) + endOf(7, 8, runner.PipelineEndedOutcomePassed, "0.1.14") + want("a re-pin's release beside the take-in's", "main.7", "main.8") + if err := ix.HeardPipelineWanted(ctx, "main", 7, 8, meshwants.PipelineWantedOutcomeRunning); err != nil { + t.Fatal(err) + } + ix.JudgePins(ctx) + want("the re-pin's release written everywhere", "main.8") } func mustRecords(t *testing.T, v []byte) []string {