use min timeout to avoid waiting for too long

Author: ndyakov

redis.go

@@ -399,10 +399,31 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
 
 			if finalState == pool.StateInitializing {
 				// Another goroutine is initializing - WAIT for it to complete
-				// Use the request context directly to respect the caller's timeout
-				// This prevents goroutines from waiting longer than their request timeout
+				// Use a context with the minimum of DialTimeout and the command timeout
+				// to prevent waiting too long for initialization
+				waitCtx := ctx
+				cmdDeadline, hasCmdDeadline := ctx.Deadline()
+				dialTimeout := c.opt.DialTimeout
+
+				if hasCmdDeadline {
+					// Calculate the minimum timeout
+					dialDeadline := time.Now().Add(dialTimeout)
+					if dialDeadline.Before(cmdDeadline) {
+						// DialTimeout is shorter, use it
+						var cancel context.CancelFunc
+						waitCtx, cancel = context.WithTimeout(ctx, dialTimeout)
+						defer cancel()
+					}
+					// else: command timeout is shorter, use ctx as-is
+				} else {
+					// No command deadline, use DialTimeout
+					var cancel context.CancelFunc
+					waitCtx, cancel = context.WithTimeout(ctx, dialTimeout)
+					defer cancel()
+				}
+
 				finalState, err := cn.GetStateMachine().AwaitAndTransition(
-					ctx,
+					waitCtx,
 					[]pool.ConnState{pool.StateIdle, pool.StateInUse},
 					pool.StateIdle, // Target is IDLE (but we're already there, so this is a no-op)
 				)