J25 A-293: a placed module's failed newest build said as refused in by-entries mode, on the builder's build-ended event
Reading the catalog half by fingerprint, the node-engine no longer reads the builder's builds, so #224's refused key was never written there and a reader waited on a build that will never be done. The engine now hears the builder's build.ended stream, read whole at start then followed (as the assigner hears it); the last trunk end of a placed module that ended failed is written as the refused key with the event's words, a later done end deletes it, an end naming a branch moves nothing. The manifest consumes mesh-delivery-builder.build.ended.**. Builds: design 47 G A-293 (with §421, §628), ADR 0593 §6, issue 1966 U1/U8 Claude-Session: https://claude.ai/code/session_01NcbgfGKaxw984XyAPfLm4h
This commit is contained in:
@@ -91,8 +91,19 @@ func (c *Composer) publishComposed(ctx context.Context) {
|
||||
func (c *Composer) newestFPs(ctx context.Context, at *published) (out map[string]string, failed map[string][2]string) {
|
||||
if c.byEntries() {
|
||||
// The newest build is the indexer's (and the builder's done key says it is built): neither is read, and the node
|
||||
// follows no branch (design 47 G §421, §628), so the state holds the wanted builds alone.
|
||||
return maps.Clone(at.fps), nil
|
||||
// follows no branch (design 47 G §421, §628), so the state holds the wanted builds alone. A placed module's newest
|
||||
// build that ended is the last trunk end the builder said of it (NoteBuildEnded): a failed one is refused (A-293).
|
||||
failed = map[string][2]string{}
|
||||
c.mu.Lock()
|
||||
if c.endsRead {
|
||||
for _, module := range at.placed {
|
||||
if e, ok := c.ends[module]; ok && e.Outcome == builds.BuildFailed {
|
||||
failed[module] = [2]string{e.Fingerprint, e.Error}
|
||||
}
|
||||
}
|
||||
}
|
||||
c.mu.Unlock()
|
||||
return maps.Clone(at.fps), failed
|
||||
}
|
||||
out = map[string]string{}
|
||||
failed = map[string][2]string{}
|
||||
@@ -153,7 +164,10 @@ func (c *Composer) writeComposed(ctx context.Context, at *published) (wrote, del
|
||||
wrote++
|
||||
c.saidComposed(key, values[key])
|
||||
}
|
||||
for _, key := range c.pastKeeping() {
|
||||
for _, key := range append(c.pastKeeping(), c.endedRefusals(values)...) {
|
||||
if _, kept := c.pubKept[key]; !kept {
|
||||
continue // past keeping and ended both
|
||||
}
|
||||
if err := c.env.ComposedState.Delete(ctx, key); err != nil {
|
||||
return wrote, deleted, fmt.Errorf("%s cannot be deleted: %w", key, err)
|
||||
}
|
||||
@@ -271,6 +285,38 @@ func (c *Composer) composedValues(ctx context.Context, at *published) (map[strin
|
||||
return out, nil
|
||||
}
|
||||
|
||||
// endedRefusals is, of the keys the state holds, each refusal a failed end of a module wrote (newestFPs) once that module's
|
||||
// last trunk end is done, at any fingerprint (design 47 G A-293): the state never says refused for a done build. A key this
|
||||
// pass writes (values), or one a want names, is not one. Under pubWrite.
|
||||
func (c *Composer) endedRefusals(values map[string][]byte) []string {
|
||||
c.mu.Lock()
|
||||
defer c.mu.Unlock()
|
||||
if !c.byEntries() || !c.endsRead {
|
||||
return nil
|
||||
}
|
||||
var out []string
|
||||
for module, last := range c.ends {
|
||||
if last.Outcome != builds.BuildDone {
|
||||
continue
|
||||
}
|
||||
for fp := range c.endFPs[module] {
|
||||
key, err := engcomp.Key(c.env.Node, module, fp)
|
||||
if err != nil || values[key] != nil || c.wants[module].Fp == fp {
|
||||
continue
|
||||
}
|
||||
kept, ok := c.pubKept[key]
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
if comp, err := engcomp.Decode(kept.Value); err == nil && comp.Refused != "" {
|
||||
out = append(out, key)
|
||||
}
|
||||
}
|
||||
}
|
||||
sort.Strings(out)
|
||||
return out
|
||||
}
|
||||
|
||||
// composedKeyOf is a composition's key in the state.
|
||||
func composedKeyOf(comp engcomp.Composed) (string, error) {
|
||||
if comp.Module == "" {
|
||||
|
||||
Reference in New Issue
Block a user