Feature 57 (config and provisioning): release mesh-controller, the reviewed release branch merged with main, on top of main

cmd/mesh-controller/release.go

@@ -1013,7 +1013,16 @@ func advanceRest(ctx context.Context, open *stores, p *inventory.Plan, now time.
 		}
 		// **A machine that says nothing on its send is left silent, not failed** (ADR 0353 §4): it is not judged
 		// until it reports, and past ApplySilentAfter it is listed and left.
-		if !reportedOnSend(byNode[node], node, g) {
+		outcome, reported := byNode[node].Outcome, reportedOnSend(byNode[node], node, g)
+		if sent, kept := g.Sent[node]; kept && !gateFirstMachine {
+			// A module handed to the provisioner is applied only once its client said so too (ADR 0362, issue 840).
+			carried := make([]string, 0, len(g.Carried))
+			for _, c := range g.Carried {
+				carried = append(carried, c.Module)
+			}
+			outcome, reported = provisionedOutcome(node, sent.Only(carried...), byNode[node], reported, provLookup(ctx))
+		}
+		if !reported {
 			if now.Sub(*g.Since) > inventory.ApplySilentAfter {
 				g.Silent = true
 				r.Silent = append(r.Silent, node)
@@ -1028,18 +1037,25 @@ func advanceRest(ctx context.Context, open *stores, p *inventory.Plan, now time.
 		if !gateFirstMachine {
 			// **Judged by its report alone** (novox/hq ADR 0360 §7): applied passes; failed or refused is named and
 			// fails the walk, with nothing put back — apply-failing says it.
-			switch rep := byNode[node]; rep.Outcome {
+			switch outcome {
 			case inventory.OutcomeApplied:
 				decide(g, inventory.GatePassed, node+" reported it applied its send (novox/hq ADR 0360)", now)
 				passCarried(ctx, open, p, g, "")
 				r.Done = append(r.Done, node)
 				changed = true
 			case inventory.OutcomeFailed, inventory.OutcomeRefused:
-				decide(g, inventory.GateFailed, fmt.Sprintf("%s %s its send", node, rep.Outcome), now)
+				decide(g, inventory.GateFailed, fmt.Sprintf("%s %s its send", node, outcome), now)
 				r.Failed = append(r.Failed, node)
 				changed = true
-				notes = append(notes, fmt.Sprintf("%s %s its send: nothing put back, apply-failing says it", node, rep.Outcome))
+				notes = append(notes, fmt.Sprintf("%s %s its send: nothing put back, apply-failing says it", node, outcome))
 			default:
+				if strings.HasPrefix(outcome, inventory.OutcomeProvisioningFailed) {
+					decide(g, inventory.GateFailed, fmt.Sprintf("%s: %s", node, outcome), now)
+					r.Failed = append(r.Failed, node)
+					changed = true
+					notes = append(notes, fmt.Sprintf("%s: %s: nothing put back, apply-failing says it", node, outcome))
+					continue
+				}
 				judging = append(judging, node+": not yet reported on its send")
 			}
 			continue