Skip to content

cmd/dockerd: refactor buildkit init in daemon startup#49040

Merged
vvoland merged 2 commits intomoby:masterfrom
thaJeztah:buildkit_init_timeout_suggestions
Feb 6, 2025
Merged

cmd/dockerd: refactor buildkit init in daemon startup#49040
vvoland merged 2 commits intomoby:masterfrom
thaJeztah:buildkit_init_timeout_suggestions

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Dec 5, 2024

cmd/dockerd: refactor buildkit init in daemon startup

  • Move the "Daemon has completed initialization" log to where it has
    actually completed initialization.
  • Move buildkit init to its own function.
  • Move the builder options to a separate struct, and change initBuildkit
    to return it instead of passing the router-options and manipulate it.

cmd/dockerd: initBuildkit: return close-func

Make it more explicit that callers must call close

@thaJeztah thaJeztah force-pushed the buildkit_init_timeout_suggestions branch from 9b20998 to d259e10 Compare December 19, 2024 14:20
@thaJeztah thaJeztah changed the title Extend buildkit init timeout for large build caches (suggestions) Refactor buildkit init in daemon startup Feb 6, 2025
cpuguy83 and others added 2 commits February 6, 2025 13:53
- Move the "Daemon has completed initialization" log to where it has
  actually completed initialization.
- Move buildkit init to its own function.
- Move the builder options to a separate struct, and change initBuildkit
  to return it instead of passing the router-options and manipulate it.

Co-authored-by: Brian Goff <[email protected]>
Co-authored-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Brian Goff <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
Make it more explicit that callers must call close

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the buildkit_init_timeout_suggestions branch from d259e10 to 2e9e798 Compare February 6, 2025 12:57
@thaJeztah thaJeztah changed the title Refactor buildkit init in daemon startup cmd/dockerd: refactor buildkit init in daemon startup Feb 6, 2025
@thaJeztah thaJeztah added status/2-code-review area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code area/builder/buildkit Build labels Feb 6, 2025
@thaJeztah thaJeztah self-assigned this Feb 6, 2025
@thaJeztah thaJeztah marked this pull request as ready for review February 6, 2025 13:03
@vvoland vvoland added this to the 28.0.0 milestone Feb 6, 2025
@vvoland vvoland merged commit 729f5bd into moby:master Feb 6, 2025
@thaJeztah thaJeztah deleted the buildkit_init_timeout_suggestions branch February 6, 2025 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/builder/buildkit Build area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code status/4-merge

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants