From 8571cf5a04db44322e6458087eeb0bd55dac7389 Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Wed, 29 Apr 2020 23:39:54 +0200 Subject: [PATCH] Create a new client on each request `docker serve` doesn't need a context any more, the server takes the current context from the request metadata and creates a new client --- backend/backend.go | 3 ++- cli/cmd/serve.go | 8 +------- cli/main.go | 12 ++++++------ containers/proxy/proxy.go | 27 +++++++++++++++------------ context/store/store.go | 6 +++++- server/server.go | 20 ++++++++++++++++++++ 6 files changed, 49 insertions(+), 27 deletions(-) diff --git a/backend/backend.go b/backend/backend.go index fec32c86..914cdac9 100644 --- a/backend/backend.go +++ b/backend/backend.go @@ -3,6 +3,7 @@ package backend import ( "context" "errors" + "fmt" ) var ( @@ -50,5 +51,5 @@ func Get(ctx context.Context, backendType string) (interface{}, error) { } } - return nil, errors.New("not found") + return nil, fmt.Errorf("backend not found for context %q", backendType) } diff --git a/cli/cmd/serve.go b/cli/cmd/serve.go index 5655eb76..fc82f455 100644 --- a/cli/cmd/serve.go +++ b/cli/cmd/serve.go @@ -5,7 +5,6 @@ import ( "net" cliv1 "github.com/docker/api/cli/v1" - "github.com/docker/api/client" "github.com/docker/api/containers/proxy" containersv1 "github.com/docker/api/containers/v1" "github.com/docker/api/context/store" @@ -45,12 +44,7 @@ func runServe(ctx context.Context, opts serveOpts) error { } defer l.Close() - c, err := client.New(ctx) - if err != nil { - return err - } - - p := proxy.NewContainerApi(c) + p := proxy.NewContainerApi() containersv1.RegisterContainersServer(s, p) cliv1.RegisterCliServer(s, &cliServer{ diff --git a/cli/main.go b/cli/main.go index 2bf38750..b44a78aa 100644 --- a/cli/main.go +++ b/cli/main.go @@ -65,14 +65,14 @@ func init() { } } -func isContextCommand(cmd *cobra.Command) bool { +func isOwnCommand(cmd *cobra.Command) bool { if cmd == nil { return false } - if cmd.Name() == "context" { + if cmd.Name() == "context" || cmd.Name() == "serve" { return true } - return isContextCommand(cmd.Parent()) + return isOwnCommand(cmd.Parent()) } func main() { @@ -82,7 +82,7 @@ func main() { Long: "docker for the 2020s", SilenceErrors: true, PersistentPreRunE: func(cmd *cobra.Command, args []string) error { - if !isContextCommand(cmd) { + if !isOwnCommand(cmd) { execMoby(cmd.Context()) } return nil @@ -94,7 +94,7 @@ func main() { helpFunc := root.HelpFunc() root.SetHelpFunc(func(cmd *cobra.Command, args []string) { - if !isContextCommand(cmd) { + if !isOwnCommand(cmd) { execMoby(cmd.Context()) } helpFunc(cmd, args) @@ -131,7 +131,7 @@ func main() { currentContext = "default" } - ctx = apicontext.WithCurrentContext(ctx, opts.Context) + ctx = apicontext.WithCurrentContext(ctx, currentContext) if err != nil { logrus.Fatal(err) } diff --git a/containers/proxy/proxy.go b/containers/proxy/proxy.go index 2c2bad24..b5cd4fe0 100644 --- a/containers/proxy/proxy.go +++ b/containers/proxy/proxy.go @@ -5,27 +5,30 @@ import ( "github.com/docker/api/client" v1 "github.com/docker/api/containers/v1" - apicontext "github.com/docker/api/context" "github.com/golang/protobuf/ptypes/empty" ) -func NewContainerApi(client *client.Client) v1.ContainersServer { - return &proxyContainerApi{ - client: client, - } +type clientKey struct{} + +func WithClient(ctx context.Context, c *client.Client) (context.Context, error) { + return context.WithValue(ctx, clientKey{}, c), nil } -type proxyContainerApi struct { - client *client.Client +func Client(ctx context.Context) *client.Client { + c, _ := ctx.Value(clientKey{}).(*client.Client) + return c } +func NewContainerApi() v1.ContainersServer { + return &proxyContainerApi{} +} + +type proxyContainerApi struct{} + func (p *proxyContainerApi) List(ctx context.Context, _ *v1.ListRequest) (*v1.ListResponse, error) { - currentContext := apicontext.CurrentContext(ctx) - if err := p.client.SetContext(ctx, currentContext); err != nil { - return &v1.ListResponse{}, nil - } + client := Client(ctx) - c, err := p.client.ContainerService().List(ctx) + c, err := client.ContainerService().List(ctx) if err != nil { return &v1.ListResponse{}, nil } diff --git a/context/store/store.go b/context/store/store.go index a9e46588..add26b58 100644 --- a/context/store/store.go +++ b/context/store/store.go @@ -112,7 +112,11 @@ func New(opts ...StoreOpt) (Store, error) { // Get returns the context with the given name func (s *store) Get(name string, getter func() interface{}) (*Metadata, error) { meta := filepath.Join(s.root, contextsDir, metadataDir, contextdirOf(name), metaFile) - return read(meta, getter) + m, err := read(meta, getter) + if os.IsNotExist(err) { + return nil, fmt.Errorf("unknown conetxt %q", name) + } + return m, nil } func read(meta string, getter func() interface{}) (*Metadata, error) { diff --git a/server/server.go b/server/server.go index aeb1b2c3..bbc4bb93 100644 --- a/server/server.go +++ b/server/server.go @@ -31,7 +31,10 @@ import ( "context" "errors" + "github.com/docker/api/client" + "github.com/docker/api/containers/proxy" apicontext "github.com/docker/api/context" + "github.com/docker/api/context/store" grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus" "google.golang.org/grpc" "google.golang.org/grpc/health" @@ -66,9 +69,26 @@ func unaryMeta(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, if !ok { return nil, errors.New("missing metadata") } + key := md[apicontext.KEY] + if len(key) == 1 { + s, err := store.New() + if err != nil { + return nil, err + } + ctx = store.WithContextStore(ctx, s) + ctx = apicontext.WithCurrentContext(ctx, key[0]) + + c, err := client.New(ctx) + if err != nil { + return nil, err + } + ctx, err = proxy.WithClient(ctx, c) + if err != nil { + return nil, err + } } m, err := handler(ctx, req) return m, err