Fix more grpc list message sizes
There are a few more places, apparently, that List operations against Swarm exist, besides just in the List methods. This increases the max received message size in those places. Signed-off-by: Drew Erny <drew.erny@docker.com>
This commit is contained in:
parent
4dc6b217d3
commit
a84a78e976
|
@ -58,6 +58,7 @@ import (
|
||||||
swarmnode "github.com/docker/swarmkit/node"
|
swarmnode "github.com/docker/swarmkit/node"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
const swarmDirName = "swarm"
|
const swarmDirName = "swarm"
|
||||||
|
@ -402,7 +403,10 @@ func (c *Cluster) Cleanup() {
|
||||||
func managerStats(client swarmapi.ControlClient, currentNodeID string) (current bool, reachable int, unreachable int, err error) {
|
func managerStats(client swarmapi.ControlClient, currentNodeID string) (current bool, reachable int, unreachable int, err error) {
|
||||||
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
|
||||||
defer cancel()
|
defer cancel()
|
||||||
nodes, err := client.ListNodes(ctx, &swarmapi.ListNodesRequest{})
|
nodes, err := client.ListNodes(
|
||||||
|
ctx, &swarmapi.ListNodesRequest{},
|
||||||
|
grpc.MaxCallRecvMsgSize(defaultRecvSizeForListResponse),
|
||||||
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return false, 0, 0, err
|
return false, 0, 0, err
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,6 +19,7 @@ import (
|
||||||
swarmnode "github.com/docker/swarmkit/node"
|
swarmnode "github.com/docker/swarmkit/node"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/sirupsen/logrus"
|
"github.com/sirupsen/logrus"
|
||||||
|
"google.golang.org/grpc"
|
||||||
)
|
)
|
||||||
|
|
||||||
// Init initializes new cluster from user provided request.
|
// Init initializes new cluster from user provided request.
|
||||||
|
@ -452,7 +453,10 @@ func (c *Cluster) Info() types.Info {
|
||||||
|
|
||||||
info.Cluster = &swarm.ClusterInfo
|
info.Cluster = &swarm.ClusterInfo
|
||||||
|
|
||||||
if r, err := state.controlClient.ListNodes(ctx, &swarmapi.ListNodesRequest{}); err != nil {
|
if r, err := state.controlClient.ListNodes(
|
||||||
|
ctx, &swarmapi.ListNodesRequest{},
|
||||||
|
grpc.MaxCallRecvMsgSize(defaultRecvSizeForListResponse),
|
||||||
|
); err != nil {
|
||||||
info.Error = err.Error()
|
info.Error = err.Error()
|
||||||
} else {
|
} else {
|
||||||
info.Nodes = len(r.Nodes)
|
info.Nodes = len(r.Nodes)
|
||||||
|
|
Loading…
Reference in New Issue