mirror of
https://github.com/docker/compose.git
synced 2026-11-18 14:13:49 +00:00
Detached `up` used to run create() then start() back to back: two separate daemon snapshots, the second blind to what the first just created or recreated. preparePlan already supports planning both phases in one pass (ScopeCreateStart, landed across lot 1) -- this wires it in for the one caller that can use it outright: `up -d`. preparePlan gains an explicit scope parameter (ScopeCreate for create(), unchanged); Up()'s detached branch now calls a new upDetached, which runs preparePlan(..., ScopeCreateStart) + executePlan once instead of create() + start(). --wait stays a post-plan verification: it re-lists containers after the plan runs (the plan may have created or recreated some, so the pre-execution snapshot can't be reused for this) and runs the same waitDependencies check start() already does. Interactive up is untouched: it still runs create() then start() with its printer/monitor listener wired in between, converging onto the plan engine separately (a riskier, later item of the same lot). ScopeCreateStart landed in lot 1 as inert code with no real caller; this is the first one, and it surfaced two latent bugs in the container-recreate path that nothing had exercised end to end before: - planRecreateContainer plans a container's recreation as Create (under a temporary "<shortID>_<name>" to avoid colliding with the old container still holding the final name) -> Stop -> Remove -> Rename(final name). The start phase's event naming and container-ID resolution (groupEventName, resolveContainerID) read the create node's published result by design (plannedReplica keeps every start-phase reference pointed at CreateNodeID, not the rename node), but execRenameContainer never updated that result after renaming -- so a recreated container's Starting/Started events kept reporting the temporary name forever. - execCreateContainer also publishes the new container into containersByService (the live view OpWaitCondition reads for depends_on health waits) under that same temporary name, with nothing refreshing it after rename either -- a dependent waiting on the recreated container's health reported Waiting/Healthy under the temporary name too. Both fixed in execRenameContainer: it now updates the create node's pctx result in place after a successful rename, and (via a new Service field on the rename Operation) patches the matching containersByService entry's name too. Each pinned by a regression test, verified by reverting the fix locally and confirming the test catches it. Verified with the full e2e suite (`go test -tags e2e ./pkg/e2e/...`) against a locally built binary -- including TestRestartWithDependencies, which is what caught both bugs in the first place -- plus the existing unit suite and lint. Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com> |
||
|---|---|---|
| .. | ||
| api | ||
| bridge | ||
| compose | ||
| dryrun | ||
| e2e | ||
| mocks | ||
| remote | ||
| utils | ||
| watch | ||