mirror of
https://github.com/docker/compose.git
synced 2026-11-18 14:13:49 +00:00
run() used to dispatch every node concurrently, with Create-phase and Start-phase cancellation scoped separately via phaseCancel so a Start-phase failure couldn't cancel unrelated in-flight Create work. That stopped short of what the interactive up convergence (lot 2's next step) actually needs: its attach/printer session takes exclusive hold of the terminal for the Create phase's own progress display, and hands it over to continuous container log streaming only once the Create phase is entirely done project-wide -- a Start-phase node's log output interleaving with Create's progress bars has nowhere consistent to go. Phase-scoped cancellation alone still let an unrelated Start-phase node begin (and start logging) while a sibling elsewhere in the plan was still being created, or had just failed. run() now splits plan.Nodes into createNodes/startNodes upfront and runs them as two fully sequential runPhase() calls: Start-phase nodes are never even dispatched until every Create-phase node has succeeded, and a Create-phase failure returns immediately without calling runPhase on startNodes at all. This matches the old create()-then- start() sequence's own fail-fast behavior, which the single-plan migration had implicitly relaxed. Added a fast-fail validation: a Create-phase node depending on a Start-phase node would otherwise deadlock forever (the Start phase isn't dispatched until the Create phase blocked on it returns, so nothing would ever close that dependency's done channel). Nothing in the reconciler should produce that edge, but failing fast with a clear error beats a silent hang if it ever does. TestExecutePlanCreatePhaseIsABarrierBeforeStartPhase and TestExecutePlanCreatePhaseFailureNeverDispatchesStartPhase cover both directions of the barrier; both verified by ablation (reverting to a single concurrent runPhase call reliably fails each, 5/5 runs). Verified: go build, go test ./pkg/compose/... (incl. -race), and golangci-lint all clean; full e2e suite re-run clean against a locally built binary (same 3 pre-existing, environment-specific failures as the stack's baseline: TestWatch, TestIPC, TestComposeModel). Local Copilot CLI review found no correctness/deadlock issues in the barrier logic itself; its two actionable findings (missing phase-ordering guard, missing never-dispatched regression test) are both addressed here. Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com> |
||
|---|---|---|
| .. | ||
| api | ||
| bridge | ||
| compose | ||
| dryrun | ||
| e2e | ||
| mocks | ||
| remote | ||
| utils | ||
| watch | ||