clientv3: configure keep-alive parameters

Signed-off-by: Gyu-Ho Lee <[email protected]>

clientv3/client.go

@@ -25,6 +25,7 @@ import (
 	"sync"
 	"time"
 
+	kp "github.com/coreos/etcd/etcdserver/api/v3rpc/keepalive"
 	"github.com/coreos/etcd/etcdserver/api/v3rpc/rpctypes"
 
 	"golang.org/x/net/context"
@@ -216,16 +217,14 @@ func (c *Client) dialSetupOpts(endpoint string, dopts ...grpc.DialOption) (opts
 	if c.cfg.DialTimeout > 0 {
 		opts = []grpc.DialOption{grpc.WithTimeout(c.cfg.DialTimeout)}
 	}
-	if c.cfg.DialKeepAliveTime > 0 {
-		params := keepalive.ClientParameters{
-			Time: c.cfg.DialKeepAliveTime,
-		}
-		// Only relevant when KeepAliveTime is non-zero
-		if c.cfg.DialKeepAliveTimeout > 0 {
-			params.Timeout = c.cfg.DialKeepAliveTimeout
-		}
-		opts = append(opts, grpc.WithKeepaliveParams(params))
+
+	params := keepalive.ClientParameters{
+		Time: kp.Policy.MinTime,
+	}
+	if c.cfg.DialKeepAliveTimeout > 0 {
+		params.Timeout = c.cfg.DialKeepAliveTimeout
 	}
+	opts = append(opts, grpc.WithKeepaliveParams(params))
 	opts = append(opts, dopts...)
 
 	f := func(host string, t time.Duration) (net.Conn, error) {

clientv3/config.go

@@ -33,10 +33,6 @@ type Config struct {
 	// DialTimeout is the timeout for failing to establish a connection.
 	DialTimeout time.Duration `json:"dial-timeout"`
 
-	// DialKeepAliveTime is the time in seconds after which client pings the server to see if
-	// transport is alive.
-	DialKeepAliveTime time.Duration `json:"dial-keep-alive-time"`
-
 	// DialKeepAliveTimeout is the time in seconds that the client waits for a response for the
 	// keep-alive probe.  If the response is not received in this time, the connection is closed.
 	DialKeepAliveTimeout time.Duration `json:"dial-keep-alive-timeout"`