wip review

Author: ndyakov

internal/pool/pool.go

@@ -509,8 +509,6 @@ func (p *ConnPool) popIdle() (*Conn, error) {
 			p.idleConns = append(p.idleConns, cn)
 		} else {
 			// LIFO: put at beginning (will be picked up last since we pop from end)
-			// currently isUsable is only set for hitless upgrades, so this is a no-op
-			// but we may need it in the future, so leaving it here for now.
 			p.idleConns = append([]*Conn{cn}, p.idleConns...)
 		}
 	}

options.go

@@ -152,8 +152,6 @@ type Options struct {
 	//	- true for FIFO pool
 	//	- false for LIFO pool.
 	//
-	// NOTE: If you are using HitlessUpgrades, this will be ignored and pool will always be FIFO.
-	//
 	// Note that FIFO has slightly higher overhead compared to LIFO,
 	// but it helps closing idle connections faster reducing the pool size.
 	// default: false
@@ -648,7 +646,7 @@ func newConnPool(
 		Dialer: func(ctx context.Context) (net.Conn, error) {
 			return dialer(ctx, opt.Network, opt.Addr)
 		},
-		PoolFIFO:                 opt.PoolFIFO || opt.HitlessUpgradeConfig.IsEnabled(), // Always FIFO with hitless upgrades
+		PoolFIFO:                 opt.PoolFIFO,
 		PoolSize:                 int32(opt.PoolSize),
 		PoolTimeout:              opt.PoolTimeout,
 		DialTimeout:              opt.DialTimeout,

redis.go

@@ -448,20 +448,15 @@ func (c *baseClient) initConn(ctx context.Context, cn *pool.Conn) error {
 	c.optLock.RLock()
 	hitlessEnabled := c.opt.HitlessUpgradeConfig.IsEnabled()
 	protocol := c.opt.Protocol
-	//endpointType := c.opt.HitlessUpgradeConfig.EndpointType
+	endpointType := c.opt.HitlessUpgradeConfig.EndpointType
 	c.optLock.RUnlock()
 	var hitlessHandshakeErr error
 	if hitlessEnabled && protocol == 3 {
-		/*
-			pipe := conn.Pipeline()
-			hitlessHandshakeErr = pipe.ClientMaintNotifications(
-				ctx,
-				true,
-				endpointType.String(),
-			).Err()
-			pipe.Exec(ctx)
-
-		*/
+		hitlessHandshakeErr = conn.ClientMaintNotifications(
+			ctx,
+			true,
+			endpointType.String(),
+		).Err()
 		if hitlessHandshakeErr != nil {
 			if !isRedisError(hitlessHandshakeErr) {
 				// if not redis error, fail the connection

redis_test.go

@@ -14,7 +14,6 @@ import (
 	. "github.com/bsm/gomega"
 	"github.com/redis/go-redis/v9"
 	"github.com/redis/go-redis/v9/auth"
-	"github.com/redis/go-redis/v9/hitless"
 )
 
 type redisHookError struct{}
@@ -627,10 +626,6 @@ var _ = Describe("Hook with MinIdleConns", func() {
 	BeforeEach(func() {
 		options := redisOptions()
 		options.MinIdleConns = 1
-		options.HitlessUpgradeConfig = &redis.HitlessUpgradeConfig{
-			Enabled: hitless.MaintNotificationsDisabled,
-		}
-		options.HitlessUpgradeConfig = nil
 		client = redis.NewClient(options)
 		Expect(client.FlushDB(ctx).Err()).NotTo(HaveOccurred())
 	})
@@ -656,7 +651,6 @@ var _ = Describe("Hook with MinIdleConns", func() {
 			processHook: func(hook redis.ProcessHook) redis.ProcessHook {
 				return func(ctx context.Context, cmd redis.Cmder) error {
 					res = append(res, "hook-2-process-start")
-					res = append(res, cmd.String())
 					err := hook(ctx, cmd)
 					res = append(res, "hook-2-process-end")
 					return err