wip

Author: ndyakov

adapters.go

@@ -17,8 +17,8 @@ var ErrInvalidCommand = errors.New("invalid command type")
 // ErrInvalidPool is returned when the pool type is not supported.
 var ErrInvalidPool = errors.New("invalid pool type")
 
-// NewClientAdapter creates a new client adapter for regular Redis clients.
-func NewClientAdapter(client *baseClient) interfaces.ClientInterface {
+// newClientAdapter creates a new client adapter for regular Redis clients.
+func newClientAdapter(client *baseClient) interfaces.ClientInterface {
 	return &clientAdapter{client: client}
 }
 

async_handoff_integration_test.go

@@ -41,7 +41,7 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 		}
 
 		// Create processor with event-driven handoff support
-		processor := hitless.NewPoolHook(3, baseDialer, nil, nil)
+		processor := hitless.NewPoolHook(baseDialer, nil, nil)
 		defer processor.Shutdown(context.Background())
 
 		// Create a test pool with hooks
@@ -52,10 +52,12 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			Dialer: func(ctx context.Context) (net.Conn, error) {
 				return &mockNetConn{addr: "original:6379"}, nil
 			},
-			PoolHooks: hookManager,
-			PoolSize:       5,
-			PoolTimeout:    time.Second,
+			PoolSize:    5,
+			PoolTimeout: time.Second,
 		})
+
+		// Add the hook to the pool after creation
+		testPool.AddPoolHook(processor)
 		defer testPool.Close()
 
 		// Set the pool reference in the processor for connection removal on handoff failure
@@ -131,7 +133,7 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			return &mockNetConn{addr: addr}, nil
 		}
 
-		processor := hitless.NewPoolHook(3, baseDialer, nil, nil)
+		processor := hitless.NewPoolHook(baseDialer, nil, nil)
 		defer processor.Shutdown(context.Background())
 
 		// Create hooks manager and add processor as hook
@@ -142,12 +144,15 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			Dialer: func(ctx context.Context) (net.Conn, error) {
 				return &mockNetConn{addr: "original:6379"}, nil
 			},
-			PoolHooks: hookManager,
+			
 			PoolSize:       10,
 			PoolTimeout:    time.Second,
 		})
 		defer testPool.Close()
 
+		// Add the hook to the pool after creation
+		testPool.AddPoolHook(processor)
+
 		// Set the pool reference in the processor
 		processor.SetPool(testPool)
 
@@ -200,7 +205,7 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			return nil, &net.OpError{Op: "dial", Err: &net.DNSError{Name: addr}}
 		}
 
-		processor := hitless.NewPoolHook(3, failingDialer, nil, nil)
+		processor := hitless.NewPoolHook(failingDialer, nil, nil)
 		defer processor.Shutdown(context.Background())
 
 		// Create hooks manager and add processor as hook
@@ -211,12 +216,15 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			Dialer: func(ctx context.Context) (net.Conn, error) {
 				return &mockNetConn{addr: "original:6379"}, nil
 			},
-			PoolHooks: hookManager,
+			
 			PoolSize:       3,
 			PoolTimeout:    time.Second,
 		})
 		defer testPool.Close()
 
+		// Add the hook to the pool after creation
+		testPool.AddPoolHook(processor)
+
 		// Set the pool reference in the processor
 		processor.SetPool(testPool)
 
@@ -260,7 +268,7 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			return &mockNetConn{addr: addr}, nil
 		}
 
-		processor := hitless.NewPoolHook(3, slowDialer, nil, nil)
+		processor := hitless.NewPoolHook(slowDialer, nil, nil)
 
 		// Create hooks manager and add processor as hook
 		hookManager := pool.NewPoolHookManager()
@@ -270,12 +278,15 @@ func TestEventDrivenHandoffIntegration(t *testing.T) {
 			Dialer: func(ctx context.Context) (net.Conn, error) {
 				return &mockNetConn{addr: "original:6379"}, nil
 			},
-			PoolHooks: hookManager,
+			
 			PoolSize:       2,
 			PoolTimeout:    time.Second,
 		})
 		defer testPool.Close()
 
+		// Add the hook to the pool after creation
+		testPool.AddPoolHook(processor)
+
 		// Set the pool reference in the processor
 		processor.SetPool(testPool)
 

commands.go

@@ -524,6 +524,9 @@ func (c cmdable) ClientInfo(ctx context.Context) *ClientInfoCmd {
 func (c cmdable) ClientMaintNotifications(ctx context.Context, enabled bool, endpointType string) *StatusCmd {
 	args := []interface{}{"client", "maint_notifications"}
 	if enabled {
+		if endpointType == "" {
+			endpointType = "none"
+		}
 		args = append(args, "on", "moving-endpoint-type", endpointType)
 	} else {
 		args = append(args, "off")

hitless/config.go

@@ -206,26 +206,26 @@ func DefaultConfig() *Config {
 		LogLevel:                   1,
 
 		// Connection Handoff Configuration
-		MaxHandoffRetries:         3,
-		HandoffQueueTimeout:       5 * time.Second,
-		HandoffRetryDelay:         1 * time.Second,
+		MaxHandoffRetries:   3,
+		HandoffQueueTimeout: 5 * time.Second,
+		HandoffRetryDelay:   1 * time.Second,
 
 		// Worker Scaling Configuration
-		WorkerScaleDownDelay:      30 * time.Second,
-		WorkerScaleUpDelay:        5 * time.Second,
-		WorkerIdleTimeout:         60 * time.Second,
+		WorkerScaleDownDelay: 30 * time.Second,
+		WorkerScaleUpDelay:   5 * time.Second,
+		WorkerIdleTimeout:    60 * time.Second,
 
 		// Connection Validation Configuration
-		ConnectionValidationTimeout:    2 * time.Second,
-		ConnectionHealthCheckInterval:  10 * time.Second,
+		ConnectionValidationTimeout:   2 * time.Second,
+		ConnectionHealthCheckInterval: 10 * time.Second,
 
 		// Operation Tracking Configuration
 		OperationCleanupInterval: 5 * time.Minute,
 		MaxActiveOperations:      10000,
 
 		// Notification Processing Configuration
-		NotificationBufferSize:   1000,
-		NotificationTimeout:      1 * time.Second,
+		NotificationBufferSize: 1000,
+		NotificationTimeout:    1 * time.Second,
 	}
 }
 
@@ -318,90 +318,6 @@ func (c *Config) Validate() error {
 	return nil
 }
 
-// ProductionConfig returns a Config optimized for production environments.
-// This configuration is tuned for high-load scenarios with enhanced reliability.
-func ProductionConfig() *Config {
-	return &Config{
-		// Basic settings
-		Enabled:                    MaintNotificationsEnabled,
-		EndpointType:               EndpointTypeAuto,
-		RelaxedTimeout:             45 * time.Second,
-		HandoffTimeout:             20 * time.Second,
-		PostHandoffRelaxedDuration: 15 * time.Second,
-
-		// Enhanced performance settings for production
-		MaxHandoffRetries:         5,
-		HandoffQueueTimeout:       10 * time.Second,
-		HandoffRetryDelay:         2 * time.Second,
-
-		// Worker scaling for high load
-		MinWorkers:                8,
-		MaxWorkers:                64,
-		HandoffQueueSize:          2000,
-		WorkerScaleDownDelay:      60 * time.Second,
-		WorkerScaleUpDelay:        3 * time.Second,
-		WorkerIdleTimeout:         120 * time.Second,
-
-		// Connection management
-		ConnectionValidationTimeout:    3 * time.Second,
-		ConnectionHealthCheckInterval:  30 * time.Second,
-
-		// Operation management for high throughput
-		OperationCleanupInterval: 2 * time.Minute,
-		MaxActiveOperations:      50000,
-
-		// Monitoring and observability
-		LogLevel:                  1, // Warnings and errors
-		NotificationBufferSize:    5000,
-		NotificationTimeout:       2 * time.Second,
-
-		// Existing fields
-		ScaleDownDelay: 2 * time.Second,
-	}
-}
-
-// DevelopmentConfig returns a Config optimized for development environments.
-// This configuration prioritizes debugging and has conservative resource usage.
-func DevelopmentConfig() *Config {
-	return &Config{
-		// Basic settings
-		Enabled:                    MaintNotificationsAuto,
-		EndpointType:               EndpointTypeAuto,
-		RelaxedTimeout:             10 * time.Second,
-		HandoffTimeout:             5 * time.Second,
-		PostHandoffRelaxedDuration: 3 * time.Second,
-
-		// Conservative performance settings
-		MaxHandoffRetries:         3,
-		HandoffQueueTimeout:       5 * time.Second,
-		HandoffRetryDelay:         1 * time.Second,
-
-		// Minimal worker scaling
-		MinWorkers:                2,
-		MaxWorkers:                8,
-		HandoffQueueSize:          100,
-		WorkerScaleDownDelay:      30 * time.Second,
-		WorkerScaleUpDelay:        5 * time.Second,
-		WorkerIdleTimeout:         60 * time.Second,
-
-		// Connection management
-		ConnectionValidationTimeout:    2 * time.Second,
-		ConnectionHealthCheckInterval:  10 * time.Second,
-
-		// Frequent cleanup for testing
-		OperationCleanupInterval: 30 * time.Second,
-		MaxActiveOperations:      1000,
-
-		// Verbose logging for debugging
-		LogLevel:                  3, // Debug level
-		NotificationBufferSize:    100,
-		NotificationTimeout:       1 * time.Second,
-
-		// Existing fields
-		ScaleDownDelay: 2 * time.Second,
-	}
-}
-
 // ApplyDefaults applies default values to any zero-value fields in the configuration.
 // This ensures that partially configured structs get sensible defaults for missing fields.
 func (c *Config) ApplyDefaults() *Config {
@@ -579,18 +495,18 @@ func (c *Config) Clone() *Config {
 		LogLevel:                   c.LogLevel,
 
 		// New configuration fields
-		MaxHandoffRetries:                c.MaxHandoffRetries,
-		HandoffQueueTimeout:              c.HandoffQueueTimeout,
-		HandoffRetryDelay:                c.HandoffRetryDelay,
-		WorkerScaleDownDelay:             c.WorkerScaleDownDelay,
-		WorkerScaleUpDelay:               c.WorkerScaleUpDelay,
-		WorkerIdleTimeout:                c.WorkerIdleTimeout,
-		ConnectionValidationTimeout:      c.ConnectionValidationTimeout,
-		ConnectionHealthCheckInterval:    c.ConnectionHealthCheckInterval,
-		OperationCleanupInterval:         c.OperationCleanupInterval,
-		MaxActiveOperations:              c.MaxActiveOperations,
-		NotificationBufferSize:           c.NotificationBufferSize,
-		NotificationTimeout:              c.NotificationTimeout,
+		MaxHandoffRetries:             c.MaxHandoffRetries,
+		HandoffQueueTimeout:           c.HandoffQueueTimeout,
+		HandoffRetryDelay:             c.HandoffRetryDelay,
+		WorkerScaleDownDelay:          c.WorkerScaleDownDelay,
+		WorkerScaleUpDelay:            c.WorkerScaleUpDelay,
+		WorkerIdleTimeout:             c.WorkerIdleTimeout,
+		ConnectionValidationTimeout:   c.ConnectionValidationTimeout,
+		ConnectionHealthCheckInterval: c.ConnectionHealthCheckInterval,
+		OperationCleanupInterval:      c.OperationCleanupInterval,
+		MaxActiveOperations:           c.MaxActiveOperations,
+		NotificationBufferSize:        c.NotificationBufferSize,
+		NotificationTimeout:           c.NotificationTimeout,
 	}
 }
 

hitless/config_test.go

@@ -249,7 +249,7 @@ func TestProcessorWithConfig(t *testing.T) {
 			return &mockNetConn{addr: addr}, nil
 		}
 
-		processor := NewPoolHook(3, baseDialer, config, nil)
+		processor := NewPoolHook(baseDialer, config, nil)
 		defer processor.Shutdown(context.Background())
 
 		// The processor should be created successfully with custom config
@@ -269,7 +269,7 @@ func TestProcessorWithConfig(t *testing.T) {
 			return &mockNetConn{addr: addr}, nil
 		}
 
-		processor := NewPoolHook(3, baseDialer, config, nil)
+		processor := NewPoolHook(baseDialer, config, nil)
 		defer processor.Shutdown(context.Background())
 
 		// Should work with partial config (defaults applied)
@@ -283,7 +283,7 @@ func TestProcessorWithConfig(t *testing.T) {
 			return &mockNetConn{addr: addr}, nil
 		}
 
-		processor := NewPoolHook(3, baseDialer, nil, nil)
+		processor := NewPoolHook(baseDialer, nil, nil)
 		defer processor.Shutdown(context.Background())
 
 		// Should use default config when nil is passed
@@ -308,7 +308,7 @@ func TestIntegrationWithApplyDefaults(t *testing.T) {
 		}
 
 		// Create processor - should apply defaults to missing fields
-		processor := NewPoolHook(3, baseDialer, partialConfig, nil)
+		processor := NewPoolHook(baseDialer, partialConfig, nil)
 		defer processor.Shutdown(context.Background())
 
 		// Processor should be created successfully
@@ -406,53 +406,8 @@ func TestEnhancedConfigValidation(t *testing.T) {
 	})
 }
 
-func TestProductionConfig(t *testing.T) {
-	config := ProductionConfig()
-
-	// Test production-specific values
-	if config.Enabled != MaintNotificationsEnabled {
-		t.Errorf("Expected production config to have Enabled = MaintNotificationsEnabled, got %v", config.Enabled)
-	}
-	if config.MaxHandoffRetries != 5 {
-		t.Errorf("Expected production config to have MaxHandoffRetries = 5, got %d", config.MaxHandoffRetries)
-	}
-	if config.HandoffQueueTimeout != 10*time.Second {
-		t.Errorf("Expected production config to have HandoffQueueTimeout = 10s, got %v", config.HandoffQueueTimeout)
-	}
-	if config.MaxActiveOperations != 50000 {
-		t.Errorf("Expected production config to have MaxActiveOperations = 50000, got %d", config.MaxActiveOperations)
-	}
-
-	// Should be valid
-	config.ApplyDefaultsWithPoolSize(100)
-	if err := config.Validate(); err != nil {
-		t.Errorf("Production config should be valid, got error: %v", err)
-	}
-}
-
-func TestDevelopmentConfig(t *testing.T) {
-	config := DevelopmentConfig()
-
-	// Test development-specific values
-	if config.Enabled != MaintNotificationsAuto {
-		t.Errorf("Expected development config to have Enabled = MaintNotificationsAuto, got %v", config.Enabled)
-	}
-	if config.LogLevel != 3 {
-		t.Errorf("Expected development config to have LogLevel = 3 (debug), got %d", config.LogLevel)
-	}
-	if config.MaxActiveOperations != 1000 {
-		t.Errorf("Expected development config to have MaxActiveOperations = 1000, got %d", config.MaxActiveOperations)
-	}
-
-	// Should be valid
-	config.ApplyDefaultsWithPoolSize(100)
-	if err := config.Validate(); err != nil {
-		t.Errorf("Development config should be valid, got error: %v", err)
-	}
-}
-
 func TestConfigClone(t *testing.T) {
-	original := ProductionConfig()
+	original := DefaultConfig()
 	original.MaxHandoffRetries = 7
 	original.HandoffQueueTimeout = 8 * time.Second