diff --git a/internal/pool/conn.go b/internal/pool/conn.go index 1095bfe..ac48113 100644 --- a/internal/pool/conn.go +++ b/internal/pool/conn.go @@ -17,14 +17,16 @@ type Conn struct { rdLocked bool wr *proto.Writer - InitedAt time.Time - pooled bool - usedAt atomic.Value + Inited bool + pooled bool + createdAt time.Time + usedAt atomic.Value } func NewConn(netConn net.Conn) *Conn { cn := &Conn{ - netConn: netConn, + netConn: netConn, + createdAt: time.Now(), } cn.rd = proto.NewReader(netConn) cn.wr = proto.NewWriter(netConn) diff --git a/internal/pool/export_test.go b/internal/pool/export_test.go new file mode 100644 index 0000000..de7a644 --- /dev/null +++ b/internal/pool/export_test.go @@ -0,0 +1,7 @@ +package pool + +import "time" + +func (cn *Conn) SetCreatedAt(tm time.Time) { + cn.createdAt = tm +} diff --git a/internal/pool/pool.go b/internal/pool/pool.go index 9cecee8..88b059c 100644 --- a/internal/pool/pool.go +++ b/internal/pool/pool.go @@ -468,7 +468,7 @@ func (p *ConnPool) isStaleConn(cn *Conn) bool { if p.opt.IdleTimeout > 0 && now.Sub(cn.UsedAt()) >= p.opt.IdleTimeout { return true } - if p.opt.MaxConnAge > 0 && now.Sub(cn.InitedAt) >= p.opt.MaxConnAge { + if p.opt.MaxConnAge > 0 && now.Sub(cn.createdAt) >= p.opt.MaxConnAge { return true } diff --git a/internal/pool/pool_test.go b/internal/pool/pool_test.go index 0250f9d..07fb48a 100644 --- a/internal/pool/pool_test.go +++ b/internal/pool/pool_test.go @@ -280,7 +280,7 @@ var _ = Describe("conns reaper", func() { case "idle": cn.SetUsedAt(time.Now().Add(-2 * idleTimeout)) case "aged": - cn.InitedAt = time.Now().Add(-2 * maxAge) + cn.SetCreatedAt(time.Now().Add(-2 * maxAge)) } conns = append(conns, cn) staleConns = append(staleConns, cn) @@ -294,9 +294,6 @@ var _ = Describe("conns reaper", func() { } for _, cn := range conns { - if cn.InitedAt.IsZero() { - cn.InitedAt = time.Now() - } connPool.Put(cn) } diff --git a/redis.go b/redis.go index aca3064..644c8da 100644 --- a/redis.go +++ b/redis.go @@ -51,11 +51,10 @@ func (c *baseClient) newConn() (*pool.Conn, error) { return nil, err } - if cn.InitedAt.IsZero() { - if err := c.initConn(cn); err != nil { - _ = c.connPool.CloseConn(cn) - return nil, err - } + err = c.initConn(cn) + if err != nil { + _ = c.connPool.CloseConn(cn) + return nil, err } return cn, nil @@ -85,12 +84,10 @@ func (c *baseClient) _getConn() (*pool.Conn, error) { return nil, err } - if cn.InitedAt.IsZero() { - err := c.initConn(cn) - if err != nil { - c.connPool.Remove(cn) - return nil, err - } + err = c.initConn(cn) + if err != nil { + c.connPool.Remove(cn) + return nil, err } return cn, nil @@ -121,7 +118,10 @@ func (c *baseClient) releaseConnStrict(cn *pool.Conn, err error) { } func (c *baseClient) initConn(cn *pool.Conn) error { - cn.InitedAt = time.Now() + if cn.Inited { + return nil + } + cn.Inited = true if c.opt.Password == "" && c.opt.DB == 0 &&