docker/buildx
1
0
Fork 0
mirror of https://gitea.com/Lydanne/buildx.git synced 2025-07-16 00:17:07 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

remote: ensure that client connection is not established twice

Browse Source 
Because remote driver implements Info() by calling
Client() internally, two instances on Client are created
backed by separate TCP connection. This hack avoids it
and improves performance.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
Tonis Tiigi
2024-06-05 22:04:59 -07:00
parent 747b75a217
commit 9ceda78057
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
driver/remote/driver.go
View File

@ -7,6 +7,7 @@ import (
"net" "net"
"os" "os"
"strings" "strings"
"sync"
"time" "time"
"github.com/docker/buildx/driver" "github.com/docker/buildx/driver"
@ -14,6 +15,7 @@ import (
"github.com/docker/buildx/util/progress" "github.com/docker/buildx/util/progress"
"github.com/moby/buildkit/client" "github.com/moby/buildkit/client"
"github.com/moby/buildkit/client/connhelper" "github.com/moby/buildkit/client/connhelper"
"github.com/moby/buildkit/util/tracing/delegated"
"github.com/pkg/errors" "github.com/pkg/errors"
) )
@ -25,6 +27,11 @@ type Driver struct {
// https://github.com/docker/docs/blob/main/content/build/drivers/remote.md // https://github.com/docker/docs/blob/main/content/build/drivers/remote.md
*tlsOpts *tlsOpts
defaultLoad bool defaultLoad bool
// remote driver caches the client because its Bootstap/Info methods reuse it internally
clientOnce sync.Once
client *client.Client
err error
} }
type tlsOpts struct { type tlsOpts struct {
@ -78,12 +85,18 @@ func (d *Driver) Rm(ctx context.Context, force, rmVolume, rmDaemon bool) error {
} }
func (d *Driver) Client(ctx context.Context, opts ...client.ClientOpt) (*client.Client, error) { func (d *Driver) Client(ctx context.Context, opts ...client.ClientOpt) (*client.Client, error) {
d.clientOnce.Do(func() {
opts = append([]client.ClientOpt{ opts = append([]client.ClientOpt{
client.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) { client.WithContextDialer(func(ctx context.Context, _ string) (net.Conn, error) {
return d.Dial(ctx) return d.Dial(ctx)
}), }),
client.WithTracerDelegate(delegated.DefaultExporter),
}, opts...) }, opts...)
return client.New(ctx, "", opts...) c, err := client.New(ctx, "", opts...)
d.client = c
d.err = err
})
return d.client, d.err
} }
func (d *Driver) Dial(ctx context.Context) (net.Conn, error) { func (d *Driver) Dial(ctx context.Context) (net.Conn, error) {