mirror of
https://github.com/redis/go-redis.git
synced 2025-11-26 06:23:09 +03:00
* wip * wip, used and unusable states * polish state machine * correct handling OnPut * better errors for tests, hook should work now * fix linter * improve reauth state management. fix tests * Update internal/pool/conn.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update internal/pool/conn.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * better timeouts * empty endpoint handoff case * fix handoff state when queued for handoff * try to detect the deadlock * try to detect the deadlock x2 * delete should be called * improve tests * fix mark on uninitialized connection * Update internal/pool/conn_state_test.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update internal/pool/conn_state_test.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update internal/pool/pool.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update internal/pool/conn_state.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update internal/pool/conn.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fix error from copilot * address copilot comment * fix(pool): pool performance (#3565) * perf(pool): replace hookManager RWMutex with atomic.Pointer and add predefined state slices - Replace hookManager RWMutex with atomic.Pointer for lock-free reads in hot paths - Add predefined state slices to avoid allocations (validFromInUse, validFromCreatedOrIdle, etc.) - Add Clone() method to PoolHookManager for atomic updates - Update AddPoolHook/RemovePoolHook to use copy-on-write pattern - Update all hookManager access points to use atomic Load() Performance improvements: - Eliminates RWMutex contention in Get/Put/Remove hot paths - Reduces allocations by reusing predefined state slices - Lock-free reads allow better CPU cache utilization * perf(pool): eliminate mutex overhead in state machine hot path The state machine was calling notifyWaiters() on EVERY Get/Put operation, which acquired a mutex even when no waiters were present (the common case). Fix: Use atomic waiterCount to check for waiters BEFORE acquiring mutex. This eliminates mutex contention in the hot path (Get/Put operations). Implementation: - Added atomic.Int32 waiterCount field to ConnStateMachine - Increment when adding waiter, decrement when removing - Check waiterCount atomically before acquiring mutex in notifyWaiters() Performance impact: - Before: mutex lock/unlock on every Get/Put (even with no waiters) - After: lock-free atomic check, only acquire mutex if waiters exist - Expected improvement: ~30-50% for Get/Put operations * perf(pool): use predefined state slices to eliminate allocations in hot path The pool was creating new slice literals on EVERY Get/Put operation: - popIdle(): []ConnState{StateCreated, StateIdle} - putConn(): []ConnState{StateInUse} - CompareAndSwapUsed(): []ConnState{StateIdle} and []ConnState{StateInUse} - MarkUnusableForHandoff(): []ConnState{StateInUse, StateIdle, StateCreated} These allocations were happening millions of times per second in the hot path. Fix: Use predefined global slices defined in conn_state.go: - validFromInUse - validFromCreatedOrIdle - validFromCreatedInUseOrIdle Performance impact: - Before: 4 slice allocations per Get/Put cycle - After: 0 allocations (use predefined slices) - Expected improvement: ~30-40% reduction in allocations and GC pressure * perf(pool): optimize TryTransition to reduce atomic operations Further optimize the hot path by: 1. Remove redundant GetState() call in the loop 2. Only check waiterCount after successful CAS (not before loop) 3. Inline the waiterCount check to avoid notifyWaiters() call overhead This reduces atomic operations from 4-5 per Get/Put to 2-3: - Before: GetState() + CAS + waiterCount.Load() + notifyWaiters mutex check - After: CAS + waiterCount.Load() (only if CAS succeeds) Performance impact: - Eliminates 1-2 atomic operations per Get/Put - Expected improvement: ~10-15% for Get/Put operations * perf(pool): add fast path for Get/Put to match master performance Introduced TryTransitionFast() for the hot path (Get/Put operations): - Single CAS operation (same as master's atomic bool) - No waiter notification overhead - No loop through valid states - No error allocation Hot path flow: 1. popIdle(): Try IDLE → IN_USE (fast), fallback to CREATED → IN_USE 2. putConn(): Try IN_USE → IDLE (fast) This matches master's performance while preserving state machine for: - Background operations (handoff/reauth use UNUSABLE state) - State validation (TryTransition still available) - Waiter notification (AwaitAndTransition for blocking) Performance comparison per Get/Put cycle: - Master: 2 atomic CAS operations - State machine (before): 5 atomic operations (2.5x slower) - State machine (after): 2 atomic CAS operations (same as master!) Expected improvement: Restore to baseline ~11,373 ops/sec * combine cas * fix linter * try faster approach * fast semaphore * better inlining for hot path * fix linter issues * use new semaphore in auth as well * linter should be happy now * add comments * Update internal/pool/conn_state.go Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * address comment * slight reordering * try to cache time if for non-critical calculation * fix wrong benchmark * add concurrent test * fix benchmark report * add additional expect to check output * comment and variable rename --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * initConn sets IDLE state - Handle unexpected conn state changes * fix precision of time cache and usedAt * allow e2e tests to run longer * Fix broken initialization of idle connections * optimize push notif * 100ms -> 50ms * use correct timer for last health check * verify pass auth on conn creation * fix assertion * fix unsafe test * fix benchmark test * improve remove conn * re doesn't support requirepass * wait more in e2e test * flaky test * add missed method in interface * fix test assertions * silence logs and faster hooks manager * address linter comment * fix flaky test * use read instad of control * use pool size for semsize * CAS instead of reading the state * preallocate errors and states * preallocate state slices * fix flaky test * fix fast semaphore that could have been starved * try to fix the semaphore * should properly notify the waiters - this way a waiter that timesout at the same time a releaser is releasing, won't throw token. the releaser will fail to notify and will pick another waiter. this hybrid approach should be faster than channels and maintains FIFO * waiter may double-release (if closed/times out) * priority of operations * use simple approach of fifo waiters * use simple channel based semaphores * address linter and tests * remove unused benchs * change log message * address pr comments * address pr comments * fix data race --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
199 lines
5.9 KiB
Go
199 lines
5.9 KiB
Go
package pool_test
|
|
|
|
import (
|
|
"bufio"
|
|
"context"
|
|
"sync/atomic"
|
|
"unsafe"
|
|
|
|
. "github.com/bsm/ginkgo/v2"
|
|
. "github.com/bsm/gomega"
|
|
|
|
"github.com/redis/go-redis/v9/internal/pool"
|
|
"github.com/redis/go-redis/v9/internal/proto"
|
|
)
|
|
|
|
var _ = Describe("Buffer Size Configuration", func() {
|
|
var connPool *pool.ConnPool
|
|
ctx := context.Background()
|
|
|
|
AfterEach(func() {
|
|
if connPool != nil {
|
|
connPool.Close()
|
|
}
|
|
})
|
|
|
|
It("should use default buffer sizes when not specified", func() {
|
|
connPool = pool.NewConnPool(&pool.Options{
|
|
Dialer: dummyDialer,
|
|
PoolSize: int32(1),
|
|
MaxConcurrentDials: 1,
|
|
PoolTimeout: 1000,
|
|
})
|
|
|
|
cn, err := connPool.NewConn(ctx)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
defer connPool.CloseConn(cn)
|
|
|
|
// Check that default buffer sizes are used (32KiB)
|
|
writerBufSize := getWriterBufSizeUnsafe(cn)
|
|
readerBufSize := getReaderBufSizeUnsafe(cn)
|
|
|
|
Expect(writerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
Expect(readerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
})
|
|
|
|
It("should use custom buffer sizes when specified", func() {
|
|
customReadSize := 32 * 1024 // 32KB
|
|
customWriteSize := 64 * 1024 // 64KB
|
|
|
|
connPool = pool.NewConnPool(&pool.Options{
|
|
Dialer: dummyDialer,
|
|
PoolSize: int32(1),
|
|
MaxConcurrentDials: 1,
|
|
PoolTimeout: 1000,
|
|
ReadBufferSize: customReadSize,
|
|
WriteBufferSize: customWriteSize,
|
|
})
|
|
|
|
cn, err := connPool.NewConn(ctx)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
defer connPool.CloseConn(cn)
|
|
|
|
// Check that custom buffer sizes are used
|
|
writerBufSize := getWriterBufSizeUnsafe(cn)
|
|
readerBufSize := getReaderBufSizeUnsafe(cn)
|
|
|
|
Expect(writerBufSize).To(Equal(customWriteSize))
|
|
Expect(readerBufSize).To(Equal(customReadSize))
|
|
})
|
|
|
|
It("should handle zero buffer sizes by using defaults", func() {
|
|
connPool = pool.NewConnPool(&pool.Options{
|
|
Dialer: dummyDialer,
|
|
PoolSize: int32(1),
|
|
MaxConcurrentDials: 1,
|
|
PoolTimeout: 1000,
|
|
ReadBufferSize: 0, // Should use default
|
|
WriteBufferSize: 0, // Should use default
|
|
})
|
|
|
|
cn, err := connPool.NewConn(ctx)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
defer connPool.CloseConn(cn)
|
|
|
|
// Check that default buffer sizes are used (32KiB)
|
|
writerBufSize := getWriterBufSizeUnsafe(cn)
|
|
readerBufSize := getReaderBufSizeUnsafe(cn)
|
|
|
|
Expect(writerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
Expect(readerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
})
|
|
|
|
It("should use 32KiB default buffer sizes for standalone NewConn", func() {
|
|
// Test that NewConn (without pool) also uses 32KiB buffers
|
|
netConn := newDummyConn()
|
|
cn := pool.NewConn(netConn)
|
|
defer cn.Close()
|
|
|
|
writerBufSize := getWriterBufSizeUnsafe(cn)
|
|
readerBufSize := getReaderBufSizeUnsafe(cn)
|
|
|
|
Expect(writerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
Expect(readerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
})
|
|
|
|
It("should use 32KiB defaults even when pool is created directly without buffer sizes", func() {
|
|
// Test the scenario where someone creates a pool directly (like in tests)
|
|
// without setting ReadBufferSize and WriteBufferSize
|
|
connPool = pool.NewConnPool(&pool.Options{
|
|
Dialer: dummyDialer,
|
|
PoolSize: int32(1),
|
|
MaxConcurrentDials: 1,
|
|
PoolTimeout: 1000,
|
|
// ReadBufferSize and WriteBufferSize are not set (will be 0)
|
|
})
|
|
|
|
cn, err := connPool.NewConn(ctx)
|
|
Expect(err).NotTo(HaveOccurred())
|
|
defer connPool.CloseConn(cn)
|
|
|
|
// Should still get 32KiB defaults because NewConnPool sets them
|
|
writerBufSize := getWriterBufSizeUnsafe(cn)
|
|
readerBufSize := getReaderBufSizeUnsafe(cn)
|
|
|
|
Expect(writerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
Expect(readerBufSize).To(Equal(proto.DefaultBufferSize)) // Default 32KiB buffer size
|
|
})
|
|
})
|
|
|
|
// Helper functions to extract buffer sizes using unsafe pointers
|
|
// The struct layout must match pool.Conn exactly to avoid checkptr violations.
|
|
// checkptr is Go's pointer safety checker, which ensures that unsafe pointer
|
|
// conversions are valid. If the struct layouts do not match exactly, this can
|
|
// cause runtime panics or incorrect memory access due to invalid pointer dereferencing.
|
|
func getWriterBufSizeUnsafe(cn *pool.Conn) int {
|
|
cnPtr := (*struct {
|
|
id uint64 // First field in pool.Conn
|
|
usedAt atomic.Int64 // Second field (atomic)
|
|
lastPutAt atomic.Int64 // Third field (atomic)
|
|
netConnAtomic interface{} // atomic.Value (interface{} has same size)
|
|
rd *proto.Reader
|
|
bw *bufio.Writer
|
|
wr *proto.Writer
|
|
// We only need fields up to bw, so we can stop here
|
|
})(unsafe.Pointer(cn))
|
|
|
|
if cnPtr.bw == nil {
|
|
return -1
|
|
}
|
|
|
|
// bufio.Writer internal structure
|
|
bwPtr := (*struct {
|
|
err error
|
|
buf []byte
|
|
n int
|
|
wr interface{}
|
|
})(unsafe.Pointer(cnPtr.bw))
|
|
|
|
return len(bwPtr.buf)
|
|
}
|
|
|
|
func getReaderBufSizeUnsafe(cn *pool.Conn) int {
|
|
cnPtr := (*struct {
|
|
id uint64 // First field in pool.Conn
|
|
usedAt atomic.Int64 // Second field (atomic)
|
|
lastPutAt atomic.Int64 // Third field (atomic)
|
|
netConnAtomic interface{} // atomic.Value (interface{} has same size)
|
|
rd *proto.Reader
|
|
bw *bufio.Writer
|
|
wr *proto.Writer
|
|
// We only need fields up to rd, so we can stop here
|
|
})(unsafe.Pointer(cn))
|
|
|
|
if cnPtr.rd == nil {
|
|
return -1
|
|
}
|
|
|
|
// proto.Reader internal structure
|
|
rdPtr := (*struct {
|
|
rd *bufio.Reader
|
|
})(unsafe.Pointer(cnPtr.rd))
|
|
|
|
if rdPtr.rd == nil {
|
|
return -1
|
|
}
|
|
|
|
// bufio.Reader internal structure
|
|
bufReaderPtr := (*struct {
|
|
buf []byte
|
|
rd interface{}
|
|
r, w int
|
|
err error
|
|
lastByte int
|
|
lastRuneSize int
|
|
})(unsafe.Pointer(rdPtr.rd))
|
|
|
|
return len(bufReaderPtr.buf)
|
|
}
|