Cleanup

internal/pool/conn.go

@@ -82,20 +82,19 @@ func (cn *Conn) Close() error {
 }
 
 func (cn *Conn) deadline(ctx context.Context, timeout time.Duration) time.Time {
+	now := time.Now()
+	cn.SetUsedAt(now)
+
 	if ctx != nil {
 		tm, ok := ctx.Deadline()
 		if ok {
-			cn.SetUsedAt(tm)
 			return tm
 		}
 	}
 
-	now := time.Now()
 	if timeout > 0 {
-		cn.SetUsedAt(now)
 		return now.Add(timeout)
 	}
 
-	cn.SetUsedAt(now)
 	return noDeadline
 }

internal/pool/pool.go

@@ -265,6 +265,10 @@ func (p *ConnPool) waitTurn(ctx context.Context) error {
 
 		select {
 		case <-done:
+			if !timer.Stop() {
+				<-timer.C
+			}
+			timers.Put(timer)
 			return ctx.Err()
 		case p.queue <- struct{}{}:
 			if !timer.Stop() {