diff options
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/vendor.conf b/vendor.conf index 6d180d62e9..b822620bd3 100644 --- a/vendor.conf +++ b/vendor.conf @@ -126,7 +126,7 @@ github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef # cluster -github.com/docker/swarmkit c82e409dc3175cc2a95edbccfd9cc1593a45dc35 # bump_v18.09 branch +github.com/docker/swarmkit 6186e40fb04a7681e25a9101dbc7418c37ef0c8b # bump_v18.09 branch github.com/gogo/protobuf v1.0.0 github.com/cloudflare/cfssl 1.3.2 github.com/fernet/fernet-go 1b2437bc582b3cfbb341ee5a29f8ef5b42912ff2 diff --git a/vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go b/vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go index 72cf073ba5..6bd0bc32ef 100644 --- a/vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go +++ b/vendor/github.com/docker/swarmkit/manager/state/raft/transport/transport.go @@ -4,6 +4,7 @@ package transport import ( "context" + "math" "net" "sync" "time" @@ -354,6 +355,15 @@ func (t *Transport) dial(addr string) (*grpc.ClientConn, error) { return net.DialTimeout("tcp", addr, timeout) })) + // TODO(dperny): this changes the max received message size for outgoing + // client connections. this means if the server sends a message larger than + // this, we will still accept and unmarshal it. i'm unsure what the + // potential consequences are of setting this to be effectively unbounded, + // so after docker/swarmkit#2774 is fixed, we should remove this option + grpcOptions = append(grpcOptions, grpc.WithDefaultCallOptions( + grpc.MaxCallRecvMsgSize(math.MaxInt32), + )) + cc, err := grpc.Dial(addr, grpcOptions...) if err != nil { return nil, err |