builder: take a registry outcome the old numbering does not hold through to the reservation
oci-artifact-registry's published of mesh-delivery-pipeline/program@0.1.6 was refused as 'not numbered by the builder' and left for the bus, up to its consumer's five deliveries, and no package-published was said: the version is the reservation's (§369), never an entry of the state versions, design 51's numbering by name, which G keeps only until it is removed (§372). Such an outcome is now taken: the reservations mark it and say package-published (A-415). The log of an outcome left for the bus names its delivery count. Builds: design 47 G §369, §372, §52, A-415
This commit is contained in:
@@ -31,6 +31,8 @@ import (
|
||||
"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds"
|
||||
"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-builder/builds/forms"
|
||||
sweep "git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshartifactsweep"
|
||||
"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshbuilds"
|
||||
"git.novox.be/novox/mesh-delivery/modules/mesh-delivery-contracts/go/seats/meshcatalog"
|
||||
|
||||
"mesh-delivery-builder/internal/build"
|
||||
"mesh-delivery-builder/internal/versions"
|
||||
@@ -271,9 +273,26 @@ func aFloorsWakeIsHeard(t *testing.T) {
|
||||
if !h.heard(context.Background(), byDigest) || !byDigest.acked || !strings.Contains(logs.String(), "the floor of m/pkg is asked again: go-package-registry said published") {
|
||||
t.Fatalf("published: acked %v, log %q", byDigest.acked, logs.String())
|
||||
}
|
||||
refused := &wakeMsg{subject: "mesh.seat.oci-artifact-registry.event.refused", data: []byte(`{"name":"m/program","version":"0.1.3","digest":"sha256:bb","reason":"bytes differ"}`)}
|
||||
if !h.heard(context.Background(), refused) || refused.acked || !refused.naked {
|
||||
t.Fatalf("a refusal the state cannot take: acked %v, naked %v, log %q", refused.acked, refused.naked, logs.String())
|
||||
// Design 47 G §369, A-415: a published of a version the reservation numbered, which the state versions does not hold, is
|
||||
// taken: its artifact is marked and package-published said, never left for the bus to give again.
|
||||
var saidPub []meshbuilds.PackagePublished
|
||||
rv := newReservations(&memReserve{vals: map[string][]byte{}, revs: map[string]uint64{}}, func(string, any) (json.RawMessage, error) {
|
||||
return json.Marshal(meshcatalog.VersionsAnswer{Module: "m"})
|
||||
}, func() jetstream.KeyValue { return &boundsKV{keys: map[string]bool{}} },
|
||||
&findings{module: builds.BuilderModule, w: &memFindings{vals: map[string][]byte{}}, logf: t.Logf, now: time.Now}, nil, t.Logf)
|
||||
rv.say = func(_ context.Context, p meshbuilds.PackagePublished) error { saidPub = append(saidPub, p); return nil }
|
||||
rv.filled.Store(true)
|
||||
res, err := rv.Reserve(context.Background(), "m", "0.1", []string{"m:program"}, versions.Source{})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := rv.Built(context.Background(), "m", res.Version, map[string]string{"m:program": "sha256:bb"}, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
h.res = rv
|
||||
published := &wakeMsg{subject: "mesh.seat.oci-artifact-registry.event.published", data: []byte(`{"name":"m/program","version":"` + res.Version + `","digest":"sha256:bb","kind":"bundle"}`)}
|
||||
if !h.heard(context.Background(), published) || !published.acked || published.naked || len(saidPub) != 1 || saidPub[0].Artifact != "m:program" {
|
||||
t.Fatalf("a published of a reserved version: acked %v, naked %v, said %+v, log %q", published.acked, published.naked, saidPub, logs.String())
|
||||
}
|
||||
if h.heard(context.Background(), &wakeMsg{subject: manifestAcceptedSubject}) {
|
||||
t.Fatal("manifest-accepted was taken as a seat's outcome")
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/nats-io/nats.go/jetstream"
|
||||
@@ -82,8 +83,15 @@ func (h *seatHearer) heard(ctx context.Context, m jetstream.Msg) bool {
|
||||
id = m.Headers().Get("x-event-id")
|
||||
}
|
||||
wake, err := h.n.Heard(ctx, se.seat, se.event, id, o)
|
||||
if errors.Is(err, versions.ErrNotNumbered) {
|
||||
// The version is no entry of the state versions, design 51's numbering by name, which G keeps only until it is removed
|
||||
// (§372); the reservation numbers a version (§369, §52) and takes the outcome in (A-415). Heard again it would stay
|
||||
// unnumbered there, so it is taken, not left for the bus.
|
||||
h.logf("%v in the state versions; the reservations take it (design 47 G §369, A-415)", err)
|
||||
err = nil
|
||||
}
|
||||
if err != nil {
|
||||
h.logf("%v; heard again", err)
|
||||
h.logf("%v; heard again (delivery %s)", err, deliveryOf(m))
|
||||
if nakErr := m.Nak(); nakErr != nil {
|
||||
h.logf("leaving %s for the bus to give again: %v", m.Subject(), nakErr)
|
||||
}
|
||||
@@ -103,6 +111,16 @@ func (h *seatHearer) heard(ctx context.Context, m jetstream.Msg) bool {
|
||||
return true
|
||||
}
|
||||
|
||||
// deliveryOf is the message's delivery count as the bus says it, so a message the bus stops giving after its consumer's
|
||||
// bound is readable in the log; "unknown" when it says none.
|
||||
func deliveryOf(m jetstream.Msg) string {
|
||||
md, err := m.Metadata()
|
||||
if err != nil || md == nil {
|
||||
return "unknown"
|
||||
}
|
||||
return strconv.FormatUint(md.NumDelivered, 10)
|
||||
}
|
||||
|
||||
func (h *seatHearer) ack(m jetstream.Msg) {
|
||||
if err := m.Ack(); err != nil {
|
||||
h.logf("acknowledging %s: %v", m.Subject(), err)
|
||||
|
||||
@@ -104,6 +104,10 @@ func (v Versions) Number(ctx context.Context, c Claim) (Decision, Entry, error)
|
||||
return Decision{}, Entry{}, fmt.Errorf("%s: the versions kept changing under 16 claims", c.Name)
|
||||
}
|
||||
|
||||
// ErrNotNumbered is a version the state versions does not hold (design 51's numbering by name): a version the reservation
|
||||
// numbered (§369) is never held there.
|
||||
var ErrNotNumbered = errors.New("not numbered by the builder")
|
||||
|
||||
// Mark moves one version to a new state by compare-and-set, as the holders' events say (published, refused, removed):
|
||||
// change edits the entry read; a version the state does not hold is an error naming it.
|
||||
func (v Versions) Mark(ctx context.Context, name, version string, change func(*Entry)) (Entry, error) {
|
||||
@@ -114,7 +118,7 @@ func (v Versions) Mark(ctx context.Context, name, version string, change func(*E
|
||||
return Entry{}, fmt.Errorf("%s: %w", key, err)
|
||||
}
|
||||
if !found {
|
||||
return Entry{}, fmt.Errorf("%s@%s is not numbered by the builder", name, version)
|
||||
return Entry{}, fmt.Errorf("%s@%s is %w", name, version, ErrNotNumbered)
|
||||
}
|
||||
e, err := Decode(raw)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user