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>
262 lines
8.4 KiB
Go
262 lines
8.4 KiB
Go
package e2e
|
||
|
||
import (
|
||
"context"
|
||
"fmt"
|
||
"os"
|
||
"strings"
|
||
"testing"
|
||
"time"
|
||
|
||
logs2 "github.com/redis/go-redis/v9/internal/maintnotifications/logs"
|
||
"github.com/redis/go-redis/v9/logging"
|
||
"github.com/redis/go-redis/v9/maintnotifications"
|
||
)
|
||
|
||
// TODO ADD TLS CONFIGS
|
||
// TestTLSConfigurationsPushNotifications tests push notifications with different TLS configurations
|
||
func ТestTLSConfigurationsPushNotifications(t *testing.T) {
|
||
if os.Getenv("E2E_SCENARIO_TESTS") != "true" {
|
||
t.Skip("Scenario tests require E2E_SCENARIO_TESTS=true")
|
||
}
|
||
|
||
ctx, cancel := context.WithTimeout(context.Background(), defaultTestTimeout)
|
||
defer cancel()
|
||
|
||
var dump = true
|
||
var errorsDetected = false
|
||
var p = func(format string, args ...interface{}) {
|
||
printLog("TLS-CONFIGS", false, format, args...)
|
||
}
|
||
|
||
var e = func(format string, args ...interface{}) {
|
||
errorsDetected = true
|
||
printLog("TLS-CONFIGS", true, format, args...)
|
||
}
|
||
|
||
// Test different TLS configurations
|
||
// Note: TLS configuration is typically handled at the Redis connection config level
|
||
// This scenario demonstrates the testing pattern for different TLS setups
|
||
tlsConfigs := []struct {
|
||
name string
|
||
description string
|
||
skipReason string
|
||
}{
|
||
{
|
||
name: "NoTLS",
|
||
description: "No TLS encryption (plain text)",
|
||
},
|
||
{
|
||
name: "TLSInsecure",
|
||
description: "TLS with insecure skip verify (testing only)",
|
||
},
|
||
{
|
||
name: "TLSSecure",
|
||
description: "Secure TLS with certificate verification",
|
||
skipReason: "Requires valid certificates in test environment",
|
||
},
|
||
{
|
||
name: "TLSMinimal",
|
||
description: "TLS with minimal version requirements",
|
||
},
|
||
{
|
||
name: "TLSStrict",
|
||
description: "Strict TLS with TLS 1.3 and specific cipher suites",
|
||
},
|
||
}
|
||
|
||
logCollector.ClearLogs()
|
||
defer func() {
|
||
logCollector.Clear()
|
||
}()
|
||
|
||
// Test each TLS configuration with its own fresh database
|
||
for _, tlsTest := range tlsConfigs {
|
||
t.Run(tlsTest.name, func(t *testing.T) {
|
||
// Setup: Create fresh database and client factory for THIS TLS config test
|
||
bdbID, factory, cleanup := SetupTestDatabaseAndFactory(t, ctx, "standalone")
|
||
defer cleanup()
|
||
t.Logf("[TLS-CONFIGS-%s] Created test database with bdb_id: %d", tlsTest.name, bdbID)
|
||
|
||
// Get endpoint config from factory (now connected to new database)
|
||
endpointConfig := factory.GetConfig()
|
||
|
||
// Create fault injector
|
||
faultInjector, err := CreateTestFaultInjector()
|
||
if err != nil {
|
||
t.Fatalf("[ERROR] Failed to create fault injector: %v", err)
|
||
}
|
||
|
||
defer func() {
|
||
if dump {
|
||
p("Pool stats:")
|
||
factory.PrintPoolStats(t)
|
||
}
|
||
}()
|
||
|
||
errorsDetected = false
|
||
var ef = func(format string, args ...interface{}) {
|
||
printLog("TLS-CONFIGS", true, format, args...)
|
||
t.FailNow()
|
||
}
|
||
|
||
if tlsTest.skipReason != "" {
|
||
t.Skipf("Skipping %s: %s", tlsTest.name, tlsTest.skipReason)
|
||
}
|
||
|
||
p("Testing TLS configuration: %s - %s", tlsTest.name, tlsTest.description)
|
||
|
||
minIdleConns := 3
|
||
poolSize := 8
|
||
maxConnections := 12
|
||
|
||
// Create Redis client with specific TLS configuration
|
||
// Note: TLS configuration is handled at the factory/connection level
|
||
client, err := factory.Create(fmt.Sprintf("tls-test-%s", tlsTest.name), &CreateClientOptions{
|
||
Protocol: 3, // RESP3 required for push notifications
|
||
PoolSize: poolSize,
|
||
MinIdleConns: minIdleConns,
|
||
MaxActiveConns: maxConnections,
|
||
MaintNotificationsConfig: &maintnotifications.Config{
|
||
Mode: maintnotifications.ModeEnabled,
|
||
HandoffTimeout: 30 * time.Second,
|
||
RelaxedTimeout: 10 * time.Second,
|
||
PostHandoffRelaxedDuration: 2 * time.Second,
|
||
MaxWorkers: 15,
|
||
EndpointType: maintnotifications.EndpointTypeExternalIP,
|
||
},
|
||
ClientName: fmt.Sprintf("tls-test-%s", tlsTest.name),
|
||
})
|
||
if err != nil {
|
||
// Some TLS configurations might fail in test environments
|
||
if tlsTest.name == "TLSSecure" || tlsTest.name == "TLSStrict" {
|
||
t.Skipf("TLS configuration %s failed (expected in test environment): %v", tlsTest.name, err)
|
||
}
|
||
ef("Failed to create client for %s: %v", tlsTest.name, err)
|
||
}
|
||
|
||
// Create timeout tracker
|
||
tracker := NewTrackingNotificationsHook()
|
||
logger := maintnotifications.NewLoggingHook(int(logging.LogLevelDebug))
|
||
setupNotificationHooks(client, tracker, logger)
|
||
defer func() {
|
||
tracker.Clear()
|
||
}()
|
||
|
||
// Verify initial connectivity
|
||
err = client.Ping(ctx).Err()
|
||
if err != nil {
|
||
if tlsTest.name == "TLSSecure" || tlsTest.name == "TLSStrict" {
|
||
t.Skipf("TLS configuration %s ping failed (expected in test environment): %v", tlsTest.name, err)
|
||
}
|
||
ef("Failed to ping Redis with %s TLS config: %v", tlsTest.name, err)
|
||
}
|
||
|
||
p("Client connected successfully with %s TLS configuration", tlsTest.name)
|
||
|
||
commandsRunner, _ := NewCommandRunner(client)
|
||
defer func() {
|
||
if dump {
|
||
stats := commandsRunner.GetStats()
|
||
p("%s TLS config stats: Operations: %d, Errors: %d, Timeout Errors: %d",
|
||
tlsTest.name, stats.Operations, stats.Errors, stats.TimeoutErrors)
|
||
}
|
||
commandsRunner.Stop()
|
||
}()
|
||
|
||
// Start command traffic
|
||
go func() {
|
||
commandsRunner.FireCommandsUntilStop(ctx)
|
||
}()
|
||
|
||
// Test migration with this TLS configuration
|
||
p("Testing migration with %s TLS configuration...", tlsTest.name)
|
||
migrateResp, err := faultInjector.TriggerAction(ctx, ActionRequest{
|
||
Type: "migrate",
|
||
Parameters: map[string]interface{}{
|
||
"bdb_id": endpointConfig.BdbID,
|
||
},
|
||
})
|
||
if err != nil {
|
||
ef("Failed to trigger migrate action for %s: %v", tlsTest.name, err)
|
||
}
|
||
|
||
// Wait for MIGRATING notification
|
||
match, found := logCollector.MatchOrWaitForLogMatchFunc(func(s string) bool {
|
||
return strings.Contains(s, logs2.ProcessingNotificationMessage) && strings.Contains(s, "MIGRATING")
|
||
}, 60*time.Second)
|
||
if !found {
|
||
ef("MIGRATING notification was not received for %s TLS config", tlsTest.name)
|
||
}
|
||
migrateData := logs2.ExtractDataFromLogMessage(match)
|
||
p("MIGRATING notification received for %s: %v", tlsTest.name, migrateData)
|
||
|
||
// Wait for migration to complete
|
||
status, err := faultInjector.WaitForAction(ctx, migrateResp.ActionID,
|
||
WithMaxWaitTime(240*time.Second),
|
||
WithPollInterval(2*time.Second),
|
||
)
|
||
if err != nil {
|
||
ef("[FI] Migrate action failed for %s: %v", tlsTest.name, err)
|
||
}
|
||
p("[FI] Migrate action completed for %s: %s %s", tlsTest.name, status.Status, actionOutputIfFailed(status))
|
||
|
||
// Continue traffic for a bit to observe TLS behavior
|
||
time.Sleep(5 * time.Second)
|
||
commandsRunner.Stop()
|
||
|
||
// Analyze results for this TLS configuration
|
||
trackerAnalysis := tracker.GetAnalysis()
|
||
if trackerAnalysis.NotificationProcessingErrors > 0 {
|
||
e("Notification processing errors with %s TLS config: %d", tlsTest.name, trackerAnalysis.NotificationProcessingErrors)
|
||
}
|
||
|
||
if trackerAnalysis.UnexpectedNotificationCount > 0 {
|
||
e("Unexpected notifications with %s TLS config: %d", tlsTest.name, trackerAnalysis.UnexpectedNotificationCount)
|
||
}
|
||
|
||
// Validate we received expected notifications
|
||
if trackerAnalysis.FailingOverCount == 0 {
|
||
e("Expected FAILING_OVER notifications with %s TLS config, got none", tlsTest.name)
|
||
}
|
||
if trackerAnalysis.FailedOverCount == 0 {
|
||
e("Expected FAILED_OVER notifications with %s TLS config, got none", tlsTest.name)
|
||
}
|
||
if trackerAnalysis.MigratingCount == 0 {
|
||
e("Expected MIGRATING notifications with %s TLS config, got none", tlsTest.name)
|
||
}
|
||
|
||
if errorsDetected {
|
||
logCollector.DumpLogs()
|
||
trackerAnalysis.Print(t)
|
||
logCollector.Clear()
|
||
tracker.Clear()
|
||
ef("[FAIL] Errors detected with %s TLS config", tlsTest.name)
|
||
}
|
||
// TLS-specific validations
|
||
stats := commandsRunner.GetStats()
|
||
switch tlsTest.name {
|
||
case "NoTLS":
|
||
// Plain text should work fine
|
||
p("Plain text connection processed %d operations", stats.Operations)
|
||
case "TLSInsecure", "TLSMinimal":
|
||
// Insecure TLS should work in test environments
|
||
p("Insecure TLS connection processed %d operations", stats.Operations)
|
||
if stats.Operations == 0 {
|
||
e("Expected operations with %s TLS config, got none", tlsTest.name)
|
||
}
|
||
case "TLSStrict":
|
||
// Strict TLS might have different performance characteristics
|
||
p("Strict TLS connection processed %d operations", stats.Operations)
|
||
}
|
||
|
||
p("TLS configuration %s test completed successfully", tlsTest.name)
|
||
})
|
||
|
||
// Clear logs between TLS configuration tests
|
||
logCollector.ClearLogs()
|
||
}
|
||
|
||
p("All TLS configurations tested successfully")
|
||
}
|