add time out support

client/client.go

@@ -42,6 +42,9 @@ var (
 	// DefaultPoolTTL sets the connection pool ttl
 	DefaultPoolTTL = time.Minute
 
+	// DefaultPoolTimeout sets the connection pool ttl
+	DefaultPoolTimeout = 5 * time.Second
+
 	// NewClient returns a new client
 	NewClient func(...Option) Client = newNamingClient
 	// NewIPAddrClient returns a new client
@@ -67,7 +70,7 @@ func newNamingClient(opts ...Option) Client {
 		// wg:          wait(options.Context),
 	}
 	// rc.once.Store(false)
-	rc.pool = newPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams(), false)
+	rc.pool = newPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams(), false, options.TimeOut)
 
 	return rc
 }
@@ -84,7 +87,7 @@ func newIPAddrClient(opts ...Option) Client {
 		// wg:          wait(options.Context),
 	}
 	// rc.once.Store(false)
-	rc.pool = newPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams(), true)
+	rc.pool = newPool(options.PoolSize, options.PoolTTL, rc.poolMaxIdle(), rc.poolMaxStreams(), true, options.TimeOut)
 
 	return rc
 }

client/grpc_pool.go

@@ -1,6 +1,8 @@
 package client
 
 import (
+	"context"
+	"fmt"
 	"sync"
 	"time"
 
@@ -9,8 +11,9 @@ import (
 )
 
 type pool struct {
-	size int
-	ttl  int64
+	timeOut time.Duration
+	size    int
+	ttl     int64
 
 	//  max streams on a *poolConn
 	maxStreams int
@@ -50,7 +53,7 @@ type poolConn struct {
 	in   bool
 }
 
-func newPool(size int, ttl time.Duration, idle int, ms int, isIPAddr bool) *pool {
+func newPool(size int, ttl time.Duration, idle int, ms int, isIPAddr bool, timeOut time.Duration) *pool {
 	if ms <= 0 {
 		ms = 1
 	}
@@ -60,6 +63,7 @@ func newPool(size int, ttl time.Duration, idle int, ms int, isIPAddr bool) *pool
 	return &pool{
 		size:       size,
 		ttl:        int64(ttl.Seconds()),
+		timeOut:    timeOut,
 		maxStreams: ms,
 		maxIdle:    idle,
 		conns:      make(map[string]*streamsPool),
@@ -135,9 +139,12 @@ func (p *pool) getConn(addr string, opts ...grpc.DialOption) (*poolConn, error)
 	p.Unlock()
 
 	//  create new conn
-	cc, err := grpc.Dial(addr, opts...)
+	ctx, cel := context.WithTimeout(context.Background(), p.timeOut)
+	defer cel()
+	cc, err := grpc.DialContext(ctx, addr, opts...)
 	if err != nil {
-		return nil, err
+		//if err == context.DeadlineExceeded { // 超时
+		return nil, fmt.Errorf("[%v]:%v", addr, err.Error())
 	}
 	conn = &poolConn{cc, nil, addr, p, sp, 1, time.Now().Unix(), nil, nil, false}
 

client/grpc_pool_test.go

@@ -38,7 +38,7 @@ func testPool(t *testing.T, size int, ttl time.Duration, idle int, ms int) {
 	defer s.Stop()
 
 	// zero pool
-	p := newPool(size, ttl, idle, ms, false)
+	p := newPool(size, ttl, idle, ms, false, 3*time.Second)
 
 	for i := 0; i < 10; i++ {
 		// get a conn

client/option.go

@@ -12,6 +12,7 @@ type Options struct {
 	// Connection Pool
 	PoolSize int
 	PoolTTL  time.Duration
+	TimeOut  time.Duration
 
 	Registry *registry.Registry
 	// registry
@@ -37,6 +38,7 @@ func newOptions(options ...Option) Options {
 		PoolSize:    DefaultPoolSize,
 		PoolTTL:     DefaultPoolTTL,
 		RegisterTTL: time.Millisecond * 100,
+		TimeOut:     DefaultPoolTimeout,
 	}
 
 	for _, o := range options {