feat: Add retry backoffs to database config (#1068)

* Add hardcoded timeouts to database config

* Pass params though config

* Fix pass values to config

* Fix config

cmd/config.go

@@ -48,6 +48,10 @@ type RedisConfig struct {
 	WriteTimeout string `yaml:"write_timeout"`
 	// MaxRetries count of retries.
 	MaxRetries int `yaml:"max_retries"`
+	// Minimum backoff between retries. Used to calculate exponential backoff. Default value is 0
+	MinRetryBackoff string `yaml:"min_retry_backoff"`
+	// Maximum backoff between retries. Used to calculate exponential backoff. Default value is 0
+	MaxRetryBackoff string `yaml:"max_retry_backoff"`
 	// Enables read-only commands on slave nodes.
 	ReadOnly bool `yaml:"read_only"`
 	// Allows routing read-only commands to the **closest** master or slave node.
@@ -68,6 +72,8 @@ func (config *RedisConfig) GetSettings() redis.DatabaseConfig {
 		SentinelUsername: config.SentinelUsername,
 		SentinelPassword: config.SentinelPassword,
 		MaxRetries:       config.MaxRetries,
+		MinRetryBackoff:  to.Duration(config.MinRetryBackoff),
+		MaxRetryBackoff:  to.Duration(config.MaxRetryBackoff),
 		MetricsTTL:       to.Duration(config.MetricsTTL),
 		DialTimeout:      to.Duration(config.DialTimeout),
 		ReadTimeout:      to.Duration(config.ReadTimeout),

database/redis/config.go

@@ -4,20 +4,27 @@ import "time"
 
 // DatabaseConfig - Redis database connection config.
 type DatabaseConfig struct {
+	Addrs []string
+
+	Username string
+	Password string
+
 	MasterName       string
-	Addrs            []string
-	Username         string
-	Password         string
 	SentinelPassword string
 	SentinelUsername string
-	MetricsTTL       time.Duration
-	DialTimeout      time.Duration
-	ReadTimeout      time.Duration
-	WriteTimeout     time.Duration
-	MaxRetries       int
-	ReadOnly         bool
-	RouteByLatency   bool
-	RouteRandomly    bool
+
+	MetricsTTL   time.Duration
+	DialTimeout  time.Duration
+	ReadTimeout  time.Duration
+	WriteTimeout time.Duration
+
+	MaxRetries      int
+	MinRetryBackoff time.Duration
+	MaxRetryBackoff time.Duration
+
+	ReadOnly       bool
+	RouteByLatency bool
+	RouteRandomly  bool
 }
 
 type NotificationHistoryConfig struct {

database/redis/database.go

@@ -52,19 +52,26 @@ type DbConnector struct {
 
 func NewDatabase(logger moira.Logger, config DatabaseConfig, nh NotificationHistoryConfig, n NotificationConfig, source DBSource) *DbConnector {
 	client := redis.NewUniversalClient(&redis.UniversalOptions{
+		Addrs: config.Addrs,
+
 		MasterName:       config.MasterName,
-		Addrs:            config.Addrs,
-		Username:         config.Username,
-		Password:         config.Password,
 		SentinelPassword: config.SentinelPassword,
 		SentinelUsername: config.SentinelUsername,
-		DialTimeout:      config.DialTimeout,
-		ReadTimeout:      config.ReadTimeout,
-		WriteTimeout:     config.WriteTimeout,
-		MaxRetries:       config.MaxRetries,
-		ReadOnly:         config.ReadOnly,
-		RouteByLatency:   config.RouteByLatency,
-		RouteRandomly:    config.RouteRandomly,
+
+		Username: config.Username,
+		Password: config.Password,
+
+		DialTimeout:  config.DialTimeout,
+		ReadTimeout:  config.ReadTimeout,
+		WriteTimeout: config.WriteTimeout,
+
+		MaxRetries:      config.MaxRetries,
+		MinRetryBackoff: config.MinRetryBackoff,
+		MaxRetryBackoff: config.MaxRetryBackoff,
+
+		ReadOnly:       config.ReadOnly,
+		RouteByLatency: config.RouteByLatency,
+		RouteRandomly:  config.RouteRandomly,
 	})
 
 	ctx := context.Background()

local/api.yml

@@ -2,6 +2,8 @@
 redis:
   addrs: "redis:6379"
   metrics_ttl: 3h
+  min_retry_backoff: 1s
+  max_retry_backoff: 10s
 telemetry:
   graphite:
     enabled: true