simplify config

Author: ndyakov

hitless/README.md

@@ -64,12 +64,11 @@ opt := &redis.Options{
     HitlessUpgrades: &redis.HitlessUpgradeConfig{
         Enabled: true,
         Config: &hitless.Config{
-            MaxHandoffRetries:           3,
-            HandoffRetryDelay:          time.Second,
-            HandoffTimeout:             30 * time.Second,
-            RelaxedTimeout:             10 * time.Second,
-            PostHandoffRelaxedDuration: 5 * time.Second,
-            LogLevel:                   1,
+            MaxHandoffRetries:           3,  // Retry failed handoffs up to 3 times
+            HandoffTimeout:             15 * time.Second, // Timeout for individual handoff operations
+            RelaxedTimeout:             10 * time.Second, // Extended timeout during migrations
+            PostHandoffRelaxedDuration: 20 * time.Second, // Keep relaxed timeout after handoff
+            LogLevel:                   1,  // Warning level logging
             MaxWorkers:                 15, // On-demand workers (default: min(10, PoolSize/3), enforced min: 10)
             HandoffQueueSize:           50, // Queue size for handoff requests
         },

hitless/config.go

@@ -78,7 +78,7 @@ type Config struct {
 	// RelaxedTimeout is the concrete timeout value to use during
 	// MIGRATING/FAILING_OVER states to accommodate increased latency.
 	// This applies to both read and write timeouts.
-	// Default: 30 seconds
+	// Default: 10 seconds
 	RelaxedTimeout time.Duration
 
 	// HandoffTimeout is the maximum time to wait for connection handoff to complete.
@@ -116,70 +116,10 @@ type Config struct {
 	// Default: 1 (warnings)
 	LogLevel int
 
-	// Connection Handoff Configuration
 	// MaxHandoffRetries is the maximum number of times to retry a failed handoff.
 	// After this many retries, the connection will be removed from the pool.
 	// Default: 3
 	MaxHandoffRetries int
-
-	// HandoffQueueTimeout is the maximum time to wait when queuing a handoff request.
-	// If the queue is full and this timeout expires, the handoff will be abandoned.
-	// Default: 5 seconds
-	HandoffQueueTimeout time.Duration
-
-	// HandoffRetryDelay is the delay between handoff retry attempts.
-	// This prevents rapid retry loops and gives the system time to recover.
-	// Default: 1 second
-	HandoffRetryDelay time.Duration
-
-	// Worker Scaling Configuration
-	// WorkerScaleDownDelay is how long to wait before scaling down workers after load decreases.
-	// This prevents rapid scaling cycles and maintains responsiveness for burst loads.
-	// Default: 30 seconds
-	WorkerScaleDownDelay time.Duration
-
-	// WorkerScaleUpDelay is how long to wait before scaling up workers when queue depth increases.
-	// This prevents over-scaling for temporary spikes.
-	// Default: 5 seconds
-	WorkerScaleUpDelay time.Duration
-
-	// WorkerIdleTimeout is how long a worker can be idle before being considered for scale-down.
-	// Workers idle longer than this may be terminated during scale-down operations.
-	// Default: 60 seconds
-	WorkerIdleTimeout time.Duration
-
-	// Connection Validation Configuration
-	// ConnectionValidationTimeout is the timeout for validating new connections during handoff.
-	// This includes connection establishment and basic health checks.
-	// Default: 2 seconds
-	ConnectionValidationTimeout time.Duration
-
-	// ConnectionHealthCheckInterval is how often to perform health checks on pooled connections.
-	// This helps detect and remove stale connections proactively.
-	// Default: 10 seconds
-	ConnectionHealthCheckInterval time.Duration
-
-	// Operation Tracking Configuration
-	// OperationCleanupInterval is how often to clean up expired MOVING operations.
-	// This prevents memory leaks from operations that never complete.
-	// Default: 5 minutes
-	OperationCleanupInterval time.Duration
-
-	// MaxActiveOperations is the maximum number of concurrent MOVING operations to track.
-	// This prevents unbounded memory growth under extreme load.
-	// Default: 10000
-	MaxActiveOperations int
-
-	// Notification Processing Configuration
-	// NotificationBufferSize is the size of the buffer for incoming push notifications.
-	// Larger buffers can handle burst notification loads better.
-	// Default: 1000
-	NotificationBufferSize int
-
-	// NotificationTimeout is the timeout for processing individual push notifications.
-	// This prevents hanging on malformed or problematic notifications.
-	// Default: 1 second
-	NotificationTimeout time.Duration
 }
 
 func (c *Config) IsEnabled() bool {
@@ -191,7 +131,7 @@ func DefaultConfig() *Config {
 	return &Config{
 		Enabled:                    MaintNotificationsAuto, // Enable by default for Redis Cloud
 		EndpointType:               EndpointTypeAuto,       // Auto-detect based on connection
-		RelaxedTimeout:             30 * time.Second,
+		RelaxedTimeout:             10 * time.Second,
 		HandoffTimeout:             15 * time.Second,
 		MaxWorkers:                 0, // Auto-calculated based on pool size
 		HandoffQueueSize:           0, // Auto-calculated based on max workers
@@ -200,26 +140,7 @@ func DefaultConfig() *Config {
 		LogLevel:                   1,
 
 		// Connection Handoff Configuration
-		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,
-
-		// Connection Validation Configuration
-		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,
+		MaxHandoffRetries: 3,
 	}
 }
 
@@ -257,54 +178,12 @@ func (c *Config) Validate() error {
 		return ErrInvalidEndpointType
 	}
 
-	// Validate new configuration fields
+	// Validate configuration fields
 	if c.MaxHandoffRetries < 1 || c.MaxHandoffRetries > 10 {
 		return ErrInvalidHandoffRetries
 	}
 
-	if c.HandoffQueueTimeout <= 0 || c.HandoffQueueTimeout > time.Minute {
-		return ErrInvalidHandoffQueueTimeout
-	}
-
-	if c.HandoffRetryDelay < 0 || c.HandoffRetryDelay > 10*time.Second {
-		return ErrInvalidHandoffRetryDelay
-	}
-
-	if c.WorkerScaleDownDelay < 0 || c.WorkerScaleDownDelay > 5*time.Minute {
-		return ErrInvalidWorkerScaleDownDelay
-	}
-
-	if c.WorkerScaleUpDelay < 0 || c.WorkerScaleUpDelay > time.Minute {
-		return ErrInvalidWorkerScaleUpDelay
-	}
-
-	if c.WorkerIdleTimeout < 0 || c.WorkerIdleTimeout > 10*time.Minute {
-		return ErrInvalidWorkerIdleTimeout
-	}
-
-	if c.ConnectionValidationTimeout <= 0 || c.ConnectionValidationTimeout > 30*time.Second {
-		return ErrInvalidConnectionValidationTimeout
-	}
-
-	if c.ConnectionHealthCheckInterval < 0 || c.ConnectionHealthCheckInterval > time.Hour {
-		return ErrInvalidConnectionHealthCheckInterval
-	}
-
-	if c.OperationCleanupInterval <= 0 || c.OperationCleanupInterval > time.Hour {
-		return ErrInvalidOperationCleanupInterval
-	}
-
-	if c.MaxActiveOperations < 100 || c.MaxActiveOperations > 100000 {
-		return ErrInvalidMaxActiveOperations
-	}
-
-	if c.NotificationBufferSize < 10 || c.NotificationBufferSize > 10000 {
-		return ErrInvalidNotificationBufferSize
-	}
 
-	if c.NotificationTimeout <= 0 || c.NotificationTimeout > 30*time.Second {
-		return ErrInvalidNotificationTimeout
-	}
 
 	return nil
 }
@@ -398,78 +277,14 @@ func (c *Config) ApplyDefaultsWithPoolSize(poolSize int) *Config {
 	// We'll use the provided value as-is, since 0 is valid
 	result.LogLevel = c.LogLevel
 
-	// Apply defaults for new configuration fields
+	// Apply defaults for configuration fields
 	if c.MaxHandoffRetries <= 0 {
 		result.MaxHandoffRetries = defaults.MaxHandoffRetries
 	} else {
 		result.MaxHandoffRetries = c.MaxHandoffRetries
 	}
 
-	if c.HandoffQueueTimeout <= 0 {
-		result.HandoffQueueTimeout = defaults.HandoffQueueTimeout
-	} else {
-		result.HandoffQueueTimeout = c.HandoffQueueTimeout
-	}
-
-	if c.HandoffRetryDelay < 0 {
-		result.HandoffRetryDelay = defaults.HandoffRetryDelay
-	} else {
-		result.HandoffRetryDelay = c.HandoffRetryDelay
-	}
-
-	if c.WorkerScaleDownDelay < 0 {
-		result.WorkerScaleDownDelay = defaults.WorkerScaleDownDelay
-	} else {
-		result.WorkerScaleDownDelay = c.WorkerScaleDownDelay
-	}
-
-	if c.WorkerScaleUpDelay < 0 {
-		result.WorkerScaleUpDelay = defaults.WorkerScaleUpDelay
-	} else {
-		result.WorkerScaleUpDelay = c.WorkerScaleUpDelay
-	}
-
-	if c.WorkerIdleTimeout < 0 {
-		result.WorkerIdleTimeout = defaults.WorkerIdleTimeout
-	} else {
-		result.WorkerIdleTimeout = c.WorkerIdleTimeout
-	}
-
-	if c.ConnectionValidationTimeout <= 0 {
-		result.ConnectionValidationTimeout = defaults.ConnectionValidationTimeout
-	} else {
-		result.ConnectionValidationTimeout = c.ConnectionValidationTimeout
-	}
 
-	if c.ConnectionHealthCheckInterval < 0 {
-		result.ConnectionHealthCheckInterval = defaults.ConnectionHealthCheckInterval
-	} else {
-		result.ConnectionHealthCheckInterval = c.ConnectionHealthCheckInterval
-	}
-
-	if c.OperationCleanupInterval <= 0 {
-		result.OperationCleanupInterval = defaults.OperationCleanupInterval
-	} else {
-		result.OperationCleanupInterval = c.OperationCleanupInterval
-	}
-
-	if c.MaxActiveOperations <= 0 {
-		result.MaxActiveOperations = defaults.MaxActiveOperations
-	} else {
-		result.MaxActiveOperations = c.MaxActiveOperations
-	}
-
-	if c.NotificationBufferSize <= 0 {
-		result.NotificationBufferSize = defaults.NotificationBufferSize
-	} else {
-		result.NotificationBufferSize = c.NotificationBufferSize
-	}
-
-	if c.NotificationTimeout <= 0 {
-		result.NotificationTimeout = defaults.NotificationTimeout
-	} else {
-		result.NotificationTimeout = c.NotificationTimeout
-	}
 
 	return result
 }
@@ -491,19 +306,8 @@ func (c *Config) Clone() *Config {
 		ScaleDownDelay:             c.ScaleDownDelay,
 		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,
+		// Configuration fields
+		MaxHandoffRetries: c.MaxHandoffRetries,
 	}
 }