utils: revert b9272a9 (#1419,#1345)

Author: spinlock

pkg/topom/topom_slots.go

@@ -396,7 +396,7 @@ func (s *Topom) newSlotActionExecutor(sid int) (func(db int) (remains int, nextd
 			if err != nil {
 				return 0, -1, err
 			}
-			defer s.action.redisp.PutClient(c, err)
+			defer s.action.redisp.PutClient(c)
 
 			if err := c.Select(db); err != nil {
 				return 0, -1, err

pkg/topom/topom_stats.go

@@ -79,7 +79,7 @@ func (s *Topom) RefreshRedisStats(timeout time.Duration) (*sync2.Future, error)
 			if err != nil {
 				return nil, err
 			}
-			defer s.ha.redisp.PutClient(c, err)
+			defer s.ha.redisp.PutClient(c)
 			m, err := c.Info()
 			if err != nil {
 				return nil, err

pkg/utils/redis/client.go

@@ -328,10 +328,15 @@ func NewPool(auth string, timeout time.Duration) *Pool {
 }
 
 func (p *Pool) isRecyclable(c *Client) bool {
-	if c.conn.Err() != nil {
+	switch {
+	case c.conn.Err() != nil:
 		return false
+	case p.timeout == 0:
+		return true
+	case p.timeout >= time.Since(c.LastUse):
+		return true
 	}
-	return p.timeout == 0 || time.Since(c.LastUse) < p.timeout
+	return false
 }
 
 func (p *Pool) Close() error {
@@ -403,10 +408,10 @@ func (p *Pool) getClientFromCache(addr string) (*Client, error) {
 	return nil, nil
 }
 
-func (p *Pool) PutClient(c *Client, err error) {
+func (p *Pool) PutClient(c *Client) {
 	p.mu.Lock()
 	defer p.mu.Unlock()
-	if err != nil || p.closed || !p.isRecyclable(c) {
+	if p.closed || !p.isRecyclable(c) {
 		c.Close()
 	} else {
 		cache := p.pool[c.Addr]
@@ -423,25 +428,17 @@ func (p *Pool) Info(addr string) (_ map[string]string, err error) {
 	if err != nil {
 		return nil, err
 	}
-	defer p.PutClient(c, err)
-	m, err := c.Info()
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
+	defer p.PutClient(c)
+	return c.Info()
 }
 
 func (p *Pool) InfoFull(addr string) (_ map[string]string, err error) {
 	c, err := p.GetClient(addr)
 	if err != nil {
 		return nil, err
 	}
-	defer p.PutClient(c, err)
-	m, err := c.InfoFull()
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
+	defer p.PutClient(c)
+	return c.InfoFull()
 }
 
 type InfoCache struct {