Skip to content

K
k3s
Unverified Commit d9823e4a authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #64804 from…

Merge pull request #64804 from mcluseau/automated-cherry-pick-of-#63977-#64672-upstream-release-1.10 Automatic merge from submit-queue. Automated cherry pick of #63977: pkg: kubelet: remote: increase grpc client default size #64672: pkg: kubelet: remote: increase grpc client default size to Cherry pick of #63977 #64672 on release-1.10. #63977: pkg: kubelet: remote: increase grpc client default size #64672: pkg: kubelet: remote: increase grpc client default size to ```release-note CRI: increase grpc client default size to 16MB ```
parents e0740b11 680004b4
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
pkg/kubelet/remote/remote_image.go
View file @ d9823e4a
...@@ -43,7 +43,7 @@ func NewRemoteImageService(endpoint string, connectionTimeout time.Duration) (in ...@@ -43,7 +43,7 @@ func NewRemoteImageService(endpoint string, connectionTimeout time.Duration) (in
return nil, err return nil, err
} }
conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithTimeout(connectionTimeout), grpc.WithDialer(dailer)) conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithTimeout(connectionTimeout), grpc.WithDialer(dailer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)))
if err != nil { if err != nil {
glog.Errorf("Connect remote image service %s failed: %v", addr, err) glog.Errorf("Connect remote image service %s failed: %v", addr, err)
return nil, err return nil, err
......
pkg/kubelet/remote/remote_runtime.go
View file @ d9823e4a
...@@ -45,7 +45,7 @@ func NewRemoteRuntimeService(endpoint string, connectionTimeout time.Duration) ( ...@@ -45,7 +45,7 @@ func NewRemoteRuntimeService(endpoint string, connectionTimeout time.Duration) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithTimeout(connectionTimeout), grpc.WithDialer(dailer)) conn, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithTimeout(connectionTimeout), grpc.WithDialer(dailer), grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)))
if err != nil { if err != nil {
glog.Errorf("Connect remote runtime %s failed: %v", addr, err) glog.Errorf("Connect remote runtime %s failed: %v", addr, err)
return nil, err return nil, err
......
pkg/kubelet/remote/utils.go
View file @ d9823e4a
...@@ -25,6 +25,10 @@ import ( ...@@ -25,6 +25,10 @@ import (
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
) )
// maxMsgSize use 16MB as the default message size limit.
// grpc library default is 4MB
const maxMsgSize = 1024 * 1024 * 16
// getContextWithTimeout returns a context with timeout. // getContextWithTimeout returns a context with timeout.
func getContextWithTimeout(timeout time.Duration) (context.Context, context.CancelFunc) { func getContextWithTimeout(timeout time.Duration) (context.Context, context.CancelFunc) {
return context.WithTimeout(context.Background(), timeout) return context.WithTimeout(context.Background(), timeout)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment