deadlock?

Author: ndyakov

hitless/hitless_manager.go

@@ -215,7 +215,11 @@ func (hm *HitlessManager) Close() error {
 
 	// Shutdown the pool hook if it exists
 	if hm.poolHooksRef != nil {
-		err := hm.poolHooksRef.Shutdown(context.Background())
+		// Use a timeout to prevent hanging indefinitely
+		shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+		defer cancel()
+
+		err := hm.poolHooksRef.Shutdown(shutdownCtx)
 		if err != nil {
 			// was not able to close pool hook, keep closed state false
 			hm.closed.Store(false)

hitless/pool_hook.go

@@ -397,8 +397,25 @@ func (ph *PoolHook) processHandoffRequest(request HandoffRequest) {
 	// Remove from pending map
 	defer ph.pending.Delete(request.Conn.GetID())
 
-	// Perform the handoff
-	err := ph.performConnectionHandoffWithPool(context.Background(), request.Conn, request.Pool)
+	// Create a context that respects shutdown signal
+	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	// Create a context that also respects the shutdown signal
+	shutdownCtx, shutdownCancel := context.WithCancel(ctx)
+	defer shutdownCancel()
+
+	// Monitor shutdown signal in a separate goroutine
+	go func() {
+		select {
+		case <-ph.shutdown:
+			shutdownCancel()
+		case <-shutdownCtx.Done():
+		}
+	}()
+
+	// Perform the handoff with cancellable context
+	err := ph.performConnectionHandoffWithPool(shutdownCtx, request.Conn, request.Pool)
 
 	// If handoff failed, restore the handoff state for potential retry
 	if err != nil {

redis.go

@@ -460,15 +460,16 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
 			switch c.opt.HitlessUpgradeConfig.Enabled {
 			case hitless.MaintNotificationsEnabled:
 				// enabled mode, fail the connection
+				c.optLock.RUnlock()
 				return fmt.Errorf("failed to enable maintenance notifications: %w", hitlessHandshakeErr)
 			case hitless.MaintNotificationsAuto:
+				c.optLock.RUnlock()
+				c.optLock.Lock()
 				// auto mode, disable hitless upgrades and continue
 				if err := c.disableHitlessUpgrades(); err != nil {
 					// Log error but continue - auto mode should be resilient
 					internal.Logger.Printf(ctx, "hitless: failed to disable hitless upgrades in auto mode: %v", err)
 				}
-				c.optLock.RUnlock()
-				c.optLock.Lock()
 				c.opt.HitlessUpgradeConfig.Enabled = hitless.MaintNotificationsDisabled
 				c.optLock.Unlock()
 			}
@@ -1263,5 +1264,3 @@ func (c *baseClient) pushNotificationHandlerContext(cn *pool.Conn) push.Notifica
 		Conn:     &connectionAdapter{conn: cn}, // Wrap in adapter for easier interface access
 	}
 }
-
-