Skip to content

chore(compose): rename convergence.go, whose convergence engine no longer exists - #14129

Merged
glours merged 1 commit into
docker:mainfrom
ndeloof:a1-rename-convergence
Aug 27, 2026
Merged

chore(compose): rename convergence.go, whose convergence engine no longer exists#14129
glours merged 1 commit into
docker:mainfrom
ndeloof:a1-rename-convergence

Conversation

@ndeloof

@ndeloof ndeloof commented Aug 27, 2026

Copy link
Copy Markdown
Contributor

The convergence type was removed long ago but the file kept its name, and its doc comment ("convergence manages service's container lifecycle") sat on top of the unrelated getScale(). Renamed to service_containers.go to match its actual content (naming, dependency waiting, container creation, start helpers).

Epic #14074, section A — split out of #14075 for focused review.

🤖 Generated with Claude Code

@docker-agent docker-agent left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assessment: 🟢 APPROVE

Pure rename/refactor — no logic changes. The updated filename reference in create.go, the new file-level doc comment, and the accurate getScale() doc comment all look correct. No issues found.

@codecov

codecov Bot commented Aug 27, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

@glours glours left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The convergence.go → service_containers.go rename is missing 3 references to the old filename

  • pkg/compose/reconcile.go:719 — comment // Nothing to do (exited containers are left as-is, matching convergence.go behavior)
  • pkg/compose/reconcile.go:1012 — comment // sortContainers sorts containers the same way as convergence.go:138-160:
  • pkg/compose/reconcile_test.go:1245 — comment // Exited containers are left as-is, matching convergence.go:199 behavior

Since the whole point of this PR (epic #14074, section A) is to fix misleading pointers to this file, it'd be worth folding these into the same change rather than leaving them for a follow-up.

…nger exists

The convergence type this file was named after was removed in fbea647,
but the file kept its name and its doc comment ('convergence manages
service's container lifecycle') ended up attached to the unrelated
getScale(). Anyone asked to 'change the convergence logic' lands here,
while the actual reconciliation lives in reconcile.go.

The file is renamed to service_containers.go with a header stating what
it really contains: the per-service container helpers shared by both
lifecycle engines (naming, service-reference resolution, dependency
waiting, container creation, startup). getScale gets a doc comment that
describes getScale.

Part of docker#14074 (A: the code misdescribes its own structure).

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
@ndeloof

ndeloof commented Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

Good catch — folded into the rename commit (1bc908e): the three references now point at service_containers.go (and the test comment is rewritten as a behavioral statement, dropping the stale :199 line number).

Note on the two reconcile.go sites: #14130 (the comments-state-behavior sibling split from the same #14075) rewrites both comments entirely as self-contained behavioral statements — whichever merges second will need a trivial rebase, I'll handle it.

@ndeloof
ndeloof force-pushed the a1-rename-convergence branch from 8037cd5 to 1bc908e Compare August 27, 2026 09:29
@glours
glours enabled auto-merge (rebase) August 27, 2026 09:36

@glours glours left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@glours
glours merged commit e801d5f into docker:main Aug 27, 2026
89 of 90 checks passed
@ndeloof
ndeloof deleted the a1-rename-convergence branch August 27, 2026 09:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants