Put a broken module back at once, and excuse a wait only for a move that added an account group (hq issue 318 review)

cmd/mesh-controller/release_plan.go

@@ -729,6 +729,9 @@ func advanceOnce(ctx context.Context, open *stores, p *inventory.Plan,
 			}
 			switch verdict {
 			case "":
+				if putBackBroken(ctx, open, p, state.Gate, m, state) {
+					return true, nil
+				}
 				pending = append(pending, fmt.Sprintf("%s judged on %s: %s", m,
 					strings.Join(state.Gate.Machines, ", "), gateLine(state.Gate)))
 				continue
@@ -961,7 +964,13 @@ func failFirstSend(ctx context.Context, open *stores, p *inventory.Plan, module
 		fmt.Printf("%s: %s\n", p.ID, p.Note)
 	}()
 	g := state.Gate
-	if g == nil || g.Verdict == "" || len(g.Failing) == 0 || slices.Contains(g.Failing, module) {
+	if g != nil && slices.Contains(g.Returned, module) {
+		// Put back at once when it broke: its rollback was made then, and is not made again.
+		state.Why = "put back when it broke; its send failed: " + g.Why
+		p.State = inventory.PlanFailed
+		p.Note = fmt.Sprintf("the send to %s in tier %d failed its gate: %s; %s was put back when it broke",
+			strings.Join(g.Machines, ", "), p.Tier, g.Why, module)
+	} else if g == nil || g.Verdict == "" || len(g.Failing) == 0 || slices.Contains(g.Failing, module) {
 		gateFailed(batched, open, p, module, state, machines, why)
 	} else if slices.Contains(g.Passing, module) && state.Build != "" {
 		// **The module the gate is kept on keeps its own pass too** (issue 318 review): healthy for the passes