Merge branch 'master' into master

pingcap · Dec 26, 2019 · a9976ad · a9976ad
2 parents 39f43c9 + 05596fe
commit a9976ad
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/store/tikv/kv.go b/store/tikv/kv.go
@@ -54,11 +54,15 @@ type Driver struct {
 }
 
 func createEtcdKV(addrs []string, tlsConfig *tls.Config) (*clientv3.Client, error) {
+	cfg := config.GetGlobalConfig()
 	cli, err := clientv3.New(clientv3.Config{
-		Endpoints:        addrs,
-		AutoSyncInterval: 30 * time.Second,
-		DialTimeout:      5 * time.Second,
-		TLS:              tlsConfig,
+		Endpoints:            addrs,
+		AutoSyncInterval:     30 * time.Second,
+		DialTimeout:          5 * time.Second,
+		TLS:                  tlsConfig,
+		DialKeepAliveTime:    time.Second * time.Duration(cfg.TiKVClient.GrpcKeepAliveTime),
+		DialKeepAliveTimeout: time.Second * time.Duration(cfg.TiKVClient.GrpcKeepAliveTimeout),
+		PermitWithoutStream:  true,
 	})
 	if err != nil {
 		return nil, errors.Trace(err)