diff --git a/internal/agent/agent.go b/internal/agent/agent.go index 33c2ff60..411b2ad2 100644 --- a/internal/agent/agent.go +++ b/internal/agent/agent.go @@ -1530,7 +1530,7 @@ func (a *Agent) baseline(ctx context.Context, module string, w wantNow, comp com a.mu.Unlock() return false } - if h.Phase == string(nodeengineclient.PhaseHeld) { + if h.Phase == string(nodeengineclient.PhaseHeld) && !judgedAgain(h.Detail) { // Held for a failed backup, and the operator's answer is still to come: the hold is kept, nothing is // backed up again or applied, and the next revision of the want is the answer (ADR 0568 §4). Said, so // why it holds is read from the journal and not guessed (issue 1585: this branch was silent). diff --git a/internal/agent/agent_test.go b/internal/agent/agent_test.go index 9e118334..d592dd83 100644 --- a/internal/agent/agent_test.go +++ b/internal/agent/agent_test.go @@ -834,6 +834,10 @@ func TestADataModuleIsBackedUpFirstAndHeldWhenItFails(t *testing.T) { {"restic: the repository is locked", meshwants.WantsByWantNodeModuleValueBackupAgain, 1, 1, nodeengineclient.PhaseRunning, false}, {"restic: the repository is locked", meshwants.WantsByWantNodeModuleValueBackupSkip, 0, 1, nodeengineclient.PhaseRunning, false}, {"restic: the repository is locked", "", 0, 0, nodeengineclient.PhaseHeld, false}, + // A hold the node-engine judges again (novox's indexer, 2026-11-16): its parts differed or its entry was not + // held, which no answer of the operator's releases; at a start it is judged again, here backed up and applied. + {PartsDiffer + " fetched and not in the want's parts: sha256:a03131c6", "", 1, 1, nodeengineclient.PhaseRunning, false}, + {EntryMissing + " the catalog half holds no entry of the build", "", 1, 1, nodeengineclient.PhaseRunning, false}, } { r := newBed(t) r.comps.before(ck1, craw1) diff --git a/internal/agent/parts.go b/internal/agent/parts.go index 850935b4..222808de 100644 --- a/internal/agent/parts.go +++ b/internal/agent/parts.go @@ -22,6 +22,14 @@ const ( EntryMissing = "entry-missing:" ) +// judgedAgain says a held have's detail is a hold the node-engine judges again at a start, not one that waits for the +// operator's answer: its want's parts differ from its composition (§524) or its entry is not held (§421). Only a failed +// backup or restore point waits for an answer (ADR 0568 §4); novox, 2026-11-16: the indexer held "parts-differ" was kept +// at a start as "held for a failed backup", waiting for an answer nobody was asked. +func judgedAgain(why string) bool { + return strings.HasPrefix(why, PartsDiffer) || heldForEntry(why) +} + // heldForEntry says whether why is a hold for the entry a want names. func heldForEntry(why string) bool { return strings.HasPrefix(why, EntryAsked) || strings.HasPrefix(why, EntryMissing)