Skip to content

driver/docker-container: verify buildkitd readiness before returning client #4029

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lyao-77 wants to merge 1 commit into from
+20 −0
Closed

driver/docker-container: verify buildkitd readiness before returning client #4029

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions driver/docker-container/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,17 @@ func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {
}

func (d *Driver) Client(ctx context.Context, opts ...client.ClientOpt) (*client.Client, error) {
// Boot() skips Bootstrap() (and therefore the readiness wait() it performs)
// whenever Info() already reports the container as Running. On a freshly
// created builder the container can be Running before buildkitd has bound
// its socket, leaving a window where dial-stdio connects but the first RPC
// fails with "error reading server preface: EOF". Verify readiness here so
// every returned client is backed by a responsive buildkitd; once buildkitd
// answers this is a single, cheap "buildctl debug workers" probe.
if err := d.wait(ctx, discardSubLogger{}); err != nil {
return nil, err
}

conn, err := d.Dial(ctx)
if err != nil {
return nil, err
Expand Down Expand Up @@ -601,6 +612,15 @@ func (d *demux) Read(dt []byte) (int, error) {
return d.Reader.Read(dt)
}

// discardSubLogger is a progress.SubLogger that drops all output. It lets
// Client() reuse the wait() readiness loop when no progress writer is available
// (wait() only emits to the logger on its terminal failure path).
type discardSubLogger struct{}

func (discardSubLogger) Wrap(_ string, fn func() error) error { return fn() }
func (discardSubLogger) Log(int, []byte) {}
func (discardSubLogger) SetStatus(*client.VertexStatus) {}

type logWriter struct {
logger progress.SubLogger
stream int
Expand Down