From 927264f5be4ad8f8ce479235a7256f92e8b5f2af Mon Sep 17 00:00:00 2001 From: Phil Estes Date: Wed, 22 Aug 2018 11:28:11 -0400 Subject: [PATCH 1/2] Fix incorrect spelling in error message Signed-off-by: Phil Estes (cherry picked from commit f962bd06ed8824d1f75d8546b428965cd61bdf7f) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 5591f0b1ee7dec101b490228258613cd7caf64ee Component: engine --- components/engine/daemon/logger/jsonfilelog/jsonfilelog.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go b/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go index 476e1d834b..bbb8eeb7ec 100644 --- a/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go +++ b/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go @@ -50,7 +50,7 @@ func New(info logger.Info) (logger.Logger, error) { return nil, err } if capval <= 0 { - return nil, fmt.Errorf("max-size should be a positive numbler") + return nil, fmt.Errorf("max-size must be a positive number") } } var maxFiles = 1 From 00083e1aa88db4c72fb5ef1901ce07961c36c177 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 29 Oct 2018 17:44:11 -0700 Subject: [PATCH 2/2] cluster: set bigger grpc limit for array requests 4MB client side limit was introduced in vendoring go-grpc#1165 (v1.4.0) making these requests likely to produce errors Signed-off-by: Tonis Tiigi (cherry picked from commit 489b8eda6674523df8b82a210399b7d2954427d0) Signed-off-by: Andrew Hsu Upstream-commit: 6ca0546f2571cf4acdc1f541bccfac23a78cb8d2 Component: engine --- components/engine/daemon/cluster/cluster.go | 8 +++++--- components/engine/daemon/cluster/services.go | 5 ++++- components/engine/daemon/cluster/tasks.go | 5 ++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/components/engine/daemon/cluster/cluster.go b/components/engine/daemon/cluster/cluster.go index 35ba5a9378..828748bc5c 100644 --- a/components/engine/daemon/cluster/cluster.go +++ b/components/engine/daemon/cluster/cluster.go @@ -41,6 +41,7 @@ package cluster // import "github.com/docker/docker/daemon/cluster" import ( "context" "fmt" + "math" "net" "os" "path/filepath" @@ -67,9 +68,10 @@ const stateFile = "docker-state.json" const defaultAddr = "0.0.0.0:2377" const ( - initialReconnectDelay = 100 * time.Millisecond - maxReconnectDelay = 30 * time.Second - contextPrefix = "com.docker.swarm" + initialReconnectDelay = 100 * time.Millisecond + maxReconnectDelay = 30 * time.Second + contextPrefix = "com.docker.swarm" + defaultRecvSizeForListResponse = math.MaxInt32 // the max recv limit grpc <1.4.0 ) // NetworkSubnetsProvider exposes functions for retrieving the subnets diff --git a/components/engine/daemon/cluster/services.go b/components/engine/daemon/cluster/services.go index c14037645c..d82c0f0f3a 100644 --- a/components/engine/daemon/cluster/services.go +++ b/components/engine/daemon/cluster/services.go @@ -23,6 +23,7 @@ import ( gogotypes "github.com/gogo/protobuf/types" "github.com/pkg/errors" "github.com/sirupsen/logrus" + "google.golang.org/grpc" ) // GetServices returns all services of a managed swarm cluster. @@ -67,7 +68,9 @@ func (c *Cluster) GetServices(options apitypes.ServiceListOptions) ([]types.Serv r, err := state.controlClient.ListServices( ctx, - &swarmapi.ListServicesRequest{Filters: filters}) + &swarmapi.ListServicesRequest{Filters: filters}, + grpc.MaxCallRecvMsgSize(defaultRecvSizeForListResponse), + ) if err != nil { return nil, err } diff --git a/components/engine/daemon/cluster/tasks.go b/components/engine/daemon/cluster/tasks.go index de1240dfe8..f1001ea0ba 100644 --- a/components/engine/daemon/cluster/tasks.go +++ b/components/engine/daemon/cluster/tasks.go @@ -8,6 +8,7 @@ import ( types "github.com/docker/docker/api/types/swarm" "github.com/docker/docker/daemon/cluster/convert" swarmapi "github.com/docker/swarmkit/api" + "google.golang.org/grpc" ) // GetTasks returns a list of tasks matching the filter options. @@ -53,7 +54,9 @@ func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, erro r, err = state.controlClient.ListTasks( ctx, - &swarmapi.ListTasksRequest{Filters: filters}) + &swarmapi.ListTasksRequest{Filters: filters}, + grpc.MaxCallRecvMsgSize(defaultRecvSizeForListResponse), + ) return err }); err != nil { return nil, err