better timeouts

internal/pool/conn.go

@@ -536,10 +536,14 @@ func (cn *Conn) SetNetConnAndInitConn(ctx context.Context, netConn net.Conn) err
 	// Wait for and transition to INITIALIZING state - this prevents concurrent initializations
 	// Valid from states: CREATED (first init), IDLE (reconnect), UNUSABLE (handoff/reauth)
 	// If another goroutine is initializing, we'll wait for it to finish
-	// Add 1ms timeout to prevent indefinite blocking
-	waitCtx, cancel := context.WithTimeout(ctx, time.Millisecond)
+	// if the context has a deadline, use that, otherwise use the connection read (relaxed) timeout
+	// which should be set during handoff. If it is not set, use a 5 second default
+	deadline, ok := ctx.Deadline()
+	if !ok {
+		deadline = time.Now().Add(cn.getEffectiveReadTimeout(5 * time.Second))
+	}
+	waitCtx, cancel := context.WithDeadline(ctx, deadline)
 	defer cancel()
-
 	finalState, err := cn.stateMachine.AwaitAndTransition(
 		waitCtx,
 		[]ConnState{StateCreated, StateIdle, StateUnusable},

redis.go

@@ -394,8 +394,8 @@ 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 AwaitAndTransition to wait for IDLE or IN_USE state
-				// Add 1ms timeout to prevent indefinite blocking
-				waitCtx, cancel := context.WithTimeout(ctx, time.Millisecond)
+				// use DialTimeout as the timeout for the wait
+				waitCtx, cancel := context.WithTimeout(ctx, c.opt.DialTimeout)
 				defer cancel()
 
 				finalState, err := cn.GetStateMachine().AwaitAndTransition(