Fix: grpc: received message larger than max

Signed-off-by: Xinfeng Liu <[email protected]>
moby · Sep 23, 2020 · 03b1989 · 03b1989
1 parent 03ed627
commit 03b1989
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 9 deletions.
diff --git a/cmd/swarmctl/cluster/list.go b/cmd/swarmctl/cluster/list.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/cmd/swarmctl/common"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 var (
@@ -31,7 +32,8 @@ var (
 			if err != nil {
 				return err
 			}
-			r, err := c.ListClusters(common.Context(cmd), &api.ListClustersRequest{})
+			r, err := c.ListClusters(common.Context(cmd), &api.ListClustersRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}

diff --git a/cmd/swarmctl/common/common.go b/cmd/swarmctl/common/common.go
@@ -3,6 +3,7 @@ package common
 import (
 	"context"
 	"crypto/tls"
+	"math"
 	"net"
 	"strings"
 	"time"
@@ -15,6 +16,8 @@ import (
 	"google.golang.org/grpc/credentials"
 )
 
+const DefaultRecvSizeForListResponse = math.MaxInt32
+
 // Dial establishes a connection and creates a client.
 // It infers connection parameters from CLI options.
 func Dial(cmd *cobra.Command) (api.ControlClient, error) {

diff --git a/cmd/swarmctl/config/list.go b/cmd/swarmctl/config/list.go
@@ -12,6 +12,7 @@ import (
 	"github.com/dustin/go-humanize"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 type configSorter []*api.Config
@@ -50,7 +51,8 @@ var (
 				return err
 			}
 
-			resp, err := client.ListConfigs(common.Context(cmd), &api.ListConfigsRequest{})
+			resp, err := client.ListConfigs(common.Context(cmd), &api.ListConfigsRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}

diff --git a/cmd/swarmctl/network/list.go b/cmd/swarmctl/network/list.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/cmd/swarmctl/common"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 var (
@@ -31,7 +32,8 @@ var (
 			if err != nil {
 				return err
 			}
-			r, err := c.ListNetworks(common.Context(cmd), &api.ListNetworksRequest{})
+			r, err := c.ListNetworks(common.Context(cmd), &api.ListNetworksRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}

diff --git a/cmd/swarmctl/node/list.go b/cmd/swarmctl/node/list.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/cmd/swarmctl/common"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 var (
@@ -31,7 +32,8 @@ var (
 			if err != nil {
 				return err
 			}
-			r, err := c.ListNodes(common.Context(cmd), &api.ListNodesRequest{})
+			r, err := c.ListNodes(common.Context(cmd), &api.ListNodesRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}

diff --git a/cmd/swarmctl/secret/list.go b/cmd/swarmctl/secret/list.go
@@ -12,6 +12,7 @@ import (
 	"github.com/dustin/go-humanize"
 	gogotypes "github.com/gogo/protobuf/types"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 type secretSorter []*api.Secret
@@ -50,7 +51,8 @@ var (
 				return err
 			}
 
-			resp, err := client.ListSecrets(common.Context(cmd), &api.ListSecretsRequest{})
+			resp, err := client.ListSecrets(common.Context(cmd), &api.ListSecretsRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}

diff --git a/cmd/swarmctl/service/list.go b/cmd/swarmctl/service/list.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/cmd/swarmctl/common"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 var (
@@ -31,12 +32,14 @@ var (
 			if err != nil {
 				return err
 			}
-			r, err := c.ListServices(common.Context(cmd), &api.ListServicesRequest{})
+			r, err := c.ListServices(common.Context(cmd), &api.ListServicesRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}
 
-			nr, err := c.ListNodes(common.Context(cmd), &api.ListNodesRequest{})
+			nr, err := c.ListNodes(common.Context(cmd), &api.ListNodesRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}
@@ -50,7 +53,8 @@ var (
 			var output func(j *api.Service)
 
 			if !quiet {
-				tr, err := c.ListTasks(common.Context(cmd), &api.ListTasksRequest{})
+				tr, err := c.ListTasks(common.Context(cmd), &api.ListTasksRequest{},
+					grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 				if err != nil {
 					return err
 				}

diff --git a/cmd/swarmctl/task/list.go b/cmd/swarmctl/task/list.go
@@ -9,6 +9,7 @@ import (
 	"github.com/docker/swarmkit/api"
 	"github.com/docker/swarmkit/cmd/swarmctl/common"
 	"github.com/spf13/cobra"
+	"google.golang.org/grpc"
 )
 
 var (
@@ -36,7 +37,8 @@ var (
 			if err != nil {
 				return err
 			}
-			r, err := c.ListTasks(common.Context(cmd), &api.ListTasksRequest{})
+			r, err := c.ListTasks(common.Context(cmd), &api.ListTasksRequest{},
+				grpc.MaxCallRecvMsgSize(common.DefaultRecvSizeForListResponse))
 			if err != nil {
 				return err
 			}