grpc: fix "too many ping" error in pd

By setting "PermitWithoutStream" to false, configurations are consistent between server(pd) and client(br) side. Already fixed in tidb: pingcap/tidb#17885
cannium · Jun 18, 2020 · 2b2d4b4 · 2b2d4b4
1 parent 56e151a
commit 2b2d4b4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/pkg/conn/conn.go b/pkg/conn/conn.go
@@ -331,9 +331,8 @@ func (mgr *Mgr) getGrpcConnLocked(ctx context.Context, storeID uint64) (*grpc.Cl
 		opt,
 		grpc.WithConnectParams(grpc.ConnectParams{Backoff: bfConf}),
 		grpc.WithKeepaliveParams(keepalive.ClientParameters{
-			Time:                time.Duration(keepAlive) * time.Second,
-			Timeout:             time.Duration(keepAliveTimeout) * time.Second,
-			PermitWithoutStream: true,
+			Time:    time.Duration(keepAlive) * time.Second,
+			Timeout: time.Duration(keepAliveTimeout) * time.Second,
 		}),
 	)
 	cancel()

diff --git a/pkg/restore/client.go b/pkg/restore/client.go
@@ -706,9 +706,8 @@ func (rc *Client) switchTiKVMode(ctx context.Context, mode import_sstpb.SwitchMo
 			opt,
 			grpc.WithConnectParams(grpc.ConnectParams{Backoff: bfConf}),
 			grpc.WithKeepaliveParams(keepalive.ClientParameters{
-				Time:                time.Duration(keepAlive) * time.Second,
-				Timeout:             time.Duration(keepAliveTimeout) * time.Second,
-				PermitWithoutStream: true,
+				Time:    time.Duration(keepAlive) * time.Second,
+				Timeout: time.Duration(keepAliveTimeout) * time.Second,
 			}),
 		)
 		cancel()