redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-12-03 18:31:14 +03:00
Code Activity

fix mark on uninitialized connection

Browse Source
This commit is contained in:
Nedyalko Dyakov
2025-10-25 00:48:35 +03:00
parent 84e856e382
commit a2c7a25196
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
async_handoff_integration_test.go
View File

@@ -93,9 +93,14 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
t.Fatalf("Failed to mark connection for handoff: %v", err)
}
t.Logf("Connection state before Put: %v, ShouldHandoff: %v", conn.GetStateMachine().GetState(), conn.ShouldHandoff())
// Return connection to pool - this should queue handoff
testPool.Put(ctx, conn)
t.Logf("Connection state after Put: %v, ShouldHandoff: %v, IsHandoffPending: %v",
conn.GetStateMachine().GetState(), conn.ShouldHandoff(), processor.IsHandoffPending(conn))
// Give the worker goroutine time to start and begin processing
// We wait for InitConn to actually start (which signals via channel)
// This ensures the handoff is actively being processed
@@ -164,10 +169,6 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
// Could be the original connection (now handed off) or a new one
testPool.Put(ctx, conn3)
if !initConnCalled.Load() {
t.Error("InitConn should have been called during handoff")
}
})
t.Run("ConcurrentHandoffs", func(t *testing.T) {

6
internal/pool/conn.go
View File

@@ -628,11 +628,11 @@ func (cn *Conn) MarkQueuedForHandoff() error {
return errors.New("handoff state changed during marking")
}
// Transition to UNUSABLE from either IN_USE (normal flow) or IDLE (edge cases/tests)
// Transition to UNUSABLE from IN_USE (normal flow), IDLE (edge cases), or CREATED (tests/uninitialized)
// The connection is typically in IN_USE state when OnPut is called (normal Put flow)
// But in some edge cases or tests, it might already be in IDLE state
// But in some edge cases or tests, it might be in IDLE or CREATED state
// The pool will detect this state change and preserve it (not overwrite with IDLE)
finalState, err := cn.stateMachine.TryTransition([]ConnState{StateInUse, StateIdle}, StateUnusable)
finalState, err := cn.stateMachine.TryTransition([]ConnState{StateInUse, StateIdle, StateCreated}, StateUnusable)
if err != nil {
// Check if already in UNUSABLE state (race condition or retry)
// ShouldHandoff should be false now, but check just in case