From 261c8e32d3048ff0dd0530bb74020b64e836003e Mon Sep 17 00:00:00 2001 From: Xiaochao Dong Date: Mon, 26 Feb 2024 07:26:31 +0800 Subject: [PATCH] cache: implement the circuit breaker pattern for asynchronous set operations in the cache client (#7010) * Implement the circuit breaker pattern for asynchronous set operations in the cache client Signed-off-by: Xiaochao Dong (@damnever) * Add feature flag for circuitbreaker Signed-off-by: Xiaochao Dong (@damnever) * Sync docs Signed-off-by: Xiaochao Dong (@damnever) * Skip configuration validation if the circuit breaker is disabled Signed-off-by: Xiaochao Dong (@damnever) * Make lint happy Signed-off-by: Xiaochao Dong (@damnever) * Abstract the logic of the circuit breaker Signed-off-by: Xiaochao Dong (@damnever) --------- Signed-off-by: Xiaochao Dong (@damnever) --- CHANGELOG.md | 1 + docs/components/query-frontend.md | 14 +++ docs/components/store.md | 21 ++++ pkg/cacheutil/cacheutil.go | 87 ++++++++++++++++ pkg/cacheutil/memcached_client.go | 51 ++++++--- pkg/cacheutil/memcached_client_test.go | 137 ++++++++++++++++++++++++- pkg/cacheutil/redis_client.go | 17 ++- pkg/cacheutil/redis_client_test.go | 42 +++++++- 8 files changed, 348 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9ca7af64e..393aeb436d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -62,6 +62,7 @@ We use *breaking :warning:* to mark changes that are not backward compatible (re - [#6887](https://github.com/thanos-io/thanos/pull/6887) Query Frontend: *breaking :warning:* Add tenant label to relevant exported metrics. Note that this change may cause some pre-existing custom dashboard queries to be incorrect due to the added label. - [#7028](https://github.com/thanos-io/thanos/pull/7028) Query|Query Frontend: Add new `--query-frontend.enable-x-functions` flag to enable experimental extended functions. - [#6884](https://github.com/thanos-io/thanos/pull/6884) Tools: Add upload-block command to upload blocks to object storage. +- [#7010](https://github.com/thanos-io/thanos/pull/7010) Cache: Added `set_async_circuit_breaker_*` to utilize the circuit breaker pattern for dynamically thresholding asynchronous set operations. ### Changed diff --git a/docs/components/query-frontend.md b/docs/components/query-frontend.md index 49d791b851..8534375af4 100644 --- a/docs/components/query-frontend.md +++ b/docs/components/query-frontend.md @@ -77,6 +77,13 @@ config: max_get_multi_batch_size: 0 dns_provider_update_interval: 0s auto_discovery: false + set_async_circuit_breaker_config: + enabled: false + half_open_max_requests: 0 + open_duration: 0s + min_requests: 0 + consecutive_failures: 0 + failure_percent: 0 expiration: 0s ``` @@ -132,6 +139,13 @@ config: master_name: "" max_async_buffer_size: 10000 max_async_concurrency: 20 + set_async_circuit_breaker_config: + enabled: false + half_open_max_requests: 10 + open_duration: 5s + min_requests: 50 + consecutive_failures: 5 + failure_percent: 0.05 expiration: 24h0m0s ``` diff --git a/docs/components/store.md b/docs/components/store.md index cf96bfdf4c..0f5f55d022 100644 --- a/docs/components/store.md +++ b/docs/components/store.md @@ -334,6 +334,13 @@ config: max_get_multi_batch_size: 0 dns_provider_update_interval: 0s auto_discovery: false + set_async_circuit_breaker_config: + enabled: false + half_open_max_requests: 0 + open_duration: 0s + min_requests: 0 + consecutive_failures: 0 + failure_percent: 0 enabled_items: [] ttl: 0s ``` @@ -353,6 +360,13 @@ While the remaining settings are **optional**: - `max_item_size`: maximum size of an item to be stored in memcached. This option should be set to the same value of memcached `-I` flag (defaults to 1MB) in order to avoid wasting network round trips to store items larger than the max item size allowed in memcached. If set to `0`, the item size is unlimited. - `dns_provider_update_interval`: the DNS discovery update interval. - `auto_discovery`: whether to use the auto-discovery mechanism for memcached. +- `set_async_circuit_breaker_config`: the configuration for the circuit breaker for asynchronous set operations. + - `enabled`: `true` to enable circuite breaker for asynchronous operations. The circuit breaker consists of three states: closed, half-open, and open. It begins in the closed state. When the total requests exceed `min_requests`, and either consecutive failures occur or the failure percentage is excessively high according to the configured values, the circuit breaker transitions to the open state. This results in the rejection of all asynchronous operations. After `open_duration`, the circuit breaker transitions to the half-open state, where it allows `half_open_max_requests` asynchronous operations to be processed in order to test if the conditions have improved. If they have not, the state transitions back to open; if they have, it transitions to the closed state. Following each 10 seconds interval in the closed state, the circuit breaker resets its metrics and repeats this cycle. + - `half_open_max_requests`: maximum number of requests allowed to pass through when the circuit breaker is half-open. If set to 0, the circuit breaker allows only 1 request. + - `open_duration`: the period of the open state after which the state of the circuit breaker becomes half-open. If set to 0, the circuit breaker utilizes the default value of 60 seconds. + - `min_requests`: minimal requests to trigger the circuit breaker, 0 signifies no requirements. + - `consecutive_failures`: consecutive failures based on `min_requests` to determine if the circuit breaker should open. + - `failure_percent`: the failure percentage, which is based on `min_requests`, to determine if the circuit breaker should open. - `enabled_items`: selectively choose what types of items to cache. Supported values are `Postings`, `Series` and `ExpandedPostings`. By default, all items are cached. - `ttl`: ttl to store index cache items in memcached. @@ -385,6 +399,13 @@ config: master_name: "" max_async_buffer_size: 10000 max_async_concurrency: 20 + set_async_circuit_breaker_config: + enabled: false + half_open_max_requests: 10 + open_duration: 5s + min_requests: 50 + consecutive_failures: 5 + failure_percent: 0.05 enabled_items: [] ttl: 0s ``` diff --git a/pkg/cacheutil/cacheutil.go b/pkg/cacheutil/cacheutil.go index 5d91bb9a3f..8f6dea7b7e 100644 --- a/pkg/cacheutil/cacheutil.go +++ b/pkg/cacheutil/cacheutil.go @@ -5,12 +5,29 @@ package cacheutil import ( "context" + "time" + "github.com/pkg/errors" + "github.com/sony/gobreaker" "golang.org/x/sync/errgroup" "github.com/thanos-io/thanos/pkg/gate" ) +var ( + errCircuitBreakerConsecutiveFailuresNotPositive = errors.New("circuit breaker: consecutive failures must be greater than 0") + errCircuitBreakerFailurePercentInvalid = errors.New("circuit breaker: failure percent must be in range (0,1]") + + defaultCircuitBreakerConfig = CircuitBreakerConfig{ + Enabled: false, + HalfOpenMaxRequests: 10, + OpenDuration: 5 * time.Second, + MinRequests: 50, + ConsecutiveFailures: 5, + FailurePercent: 0.05, + } +) + // doWithBatch do func with batch and gate. batchSize==0 means one batch. gate==nil means no gate. func doWithBatch(ctx context.Context, totalSize int, batchSize int, ga gate.Gate, f func(startIndex, endIndex int) error) error { if totalSize == 0 { @@ -40,3 +57,73 @@ func doWithBatch(ctx context.Context, totalSize int, batchSize int, ga gate.Gate } return g.Wait() } + +// CircuitBreaker implements the circuit breaker pattern https://en.wikipedia.org/wiki/Circuit_breaker_design_pattern. +type CircuitBreaker interface { + Execute(func() error) error +} + +// CircuitBreakerConfig is the config for the circuite breaker. +type CircuitBreakerConfig struct { + // Enabled enables circuite breaker. + Enabled bool `yaml:"enabled"` + + // HalfOpenMaxRequests is the maximum number of requests allowed to pass through + // when the circuit breaker is half-open. + // If set to 0, the circuit breaker allows only 1 request. + HalfOpenMaxRequests uint32 `yaml:"half_open_max_requests"` + // OpenDuration is the period of the open state after which the state of the circuit breaker becomes half-open. + // If set to 0, the circuit breaker utilizes the default value of 60 seconds. + OpenDuration time.Duration `yaml:"open_duration"` + // MinRequests is minimal requests to trigger the circuit breaker. + MinRequests uint32 `yaml:"min_requests"` + // ConsecutiveFailures represents consecutive failures based on CircuitBreakerMinRequests to determine if the circuit breaker should open. + ConsecutiveFailures uint32 `yaml:"consecutive_failures"` + // FailurePercent represents the failure percentage, which is based on CircuitBreakerMinRequests, to determine if the circuit breaker should open. + FailurePercent float64 `yaml:"failure_percent"` +} + +func (c CircuitBreakerConfig) validate() error { + if !c.Enabled { + return nil + } + if c.ConsecutiveFailures == 0 { + return errCircuitBreakerConsecutiveFailuresNotPositive + } + if c.FailurePercent <= 0 || c.FailurePercent > 1 { + return errCircuitBreakerFailurePercentInvalid + } + return nil +} + +type noopCircuitBreaker struct{} + +func (noopCircuitBreaker) Execute(f func() error) error { return f() } + +type gobreakerCircuitBreaker struct { + *gobreaker.CircuitBreaker +} + +func (cb gobreakerCircuitBreaker) Execute(f func() error) error { + _, err := cb.CircuitBreaker.Execute(func() (any, error) { + return nil, f() + }) + return err +} + +func newCircuitBreaker(name string, config CircuitBreakerConfig) CircuitBreaker { + if !config.Enabled { + return noopCircuitBreaker{} + } + return gobreakerCircuitBreaker{gobreaker.NewCircuitBreaker(gobreaker.Settings{ + Name: name, + MaxRequests: config.HalfOpenMaxRequests, + Interval: 10 * time.Second, + Timeout: config.OpenDuration, + ReadyToTrip: func(counts gobreaker.Counts) bool { + return counts.Requests >= config.MinRequests && + (counts.ConsecutiveFailures >= uint32(config.ConsecutiveFailures) || + float64(counts.TotalFailures)/float64(counts.Requests) >= config.FailurePercent) + }, + })} +} diff --git a/pkg/cacheutil/memcached_client.go b/pkg/cacheutil/memcached_client.go index 29caaed02b..8c10a9a874 100644 --- a/pkg/cacheutil/memcached_client.go +++ b/pkg/cacheutil/memcached_client.go @@ -17,6 +17,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "github.com/sony/gobreaker" "gopkg.in/yaml.v2" "github.com/thanos-io/thanos/pkg/discovery/dns" @@ -54,6 +55,8 @@ var ( MaxGetMultiBatchSize: 0, DNSProviderUpdateInterval: 10 * time.Second, AutoDiscovery: false, + + SetAsyncCircuitBreaker: defaultCircuitBreakerConfig, } ) @@ -141,6 +144,9 @@ type MemcachedClientConfig struct { // AutoDiscovery configures memached client to perform auto-discovery instead of DNS resolution AutoDiscovery bool `yaml:"auto_discovery"` + + // SetAsyncCircuitBreaker configures the circuit breaker for SetAsync operations. + SetAsyncCircuitBreaker CircuitBreakerConfig `yaml:"set_async_circuit_breaker_config"` } func (c *MemcachedClientConfig) validate() error { @@ -158,6 +164,9 @@ func (c *MemcachedClientConfig) validate() error { return errMemcachedMaxAsyncConcurrencyNotPositive } + if err := c.SetAsyncCircuitBreaker.validate(); err != nil { + return err + } return nil } @@ -195,6 +204,8 @@ type memcachedClient struct { dataSize *prometheus.HistogramVec p *AsyncOperationProcessor + + setAsyncCircuitBreaker CircuitBreaker } // AddressProvider performs node address resolution given a list of clusters. @@ -277,7 +288,8 @@ func newMemcachedClient( config.MaxGetMultiConcurrency, gate.Gets, ), - p: NewAsyncOperationProcessor(config.MaxAsyncBufferSize, config.MaxAsyncConcurrency), + p: NewAsyncOperationProcessor(config.MaxAsyncBufferSize, config.MaxAsyncConcurrency), + setAsyncCircuitBreaker: newCircuitBreaker("memcached-set-async", config.SetAsyncCircuitBreaker), } c.clientInfo = promauto.With(reg).NewGaugeFunc(prometheus.GaugeOpts{ @@ -375,22 +387,31 @@ func (c *memcachedClient) SetAsync(key string, value []byte, ttl time.Duration) start := time.Now() c.operations.WithLabelValues(opSet).Inc() - err := c.client.Set(&memcache.Item{ - Key: key, - Value: value, - Expiration: int32(time.Now().Add(ttl).Unix()), + err := c.setAsyncCircuitBreaker.Execute(func() error { + return c.client.Set(&memcache.Item{ + Key: key, + Value: value, + Expiration: int32(time.Now().Add(ttl).Unix()), + }) }) if err != nil { - // If the PickServer will fail for any reason the server address will be nil - // and so missing in the logs. We're OK with that (it's a best effort). - serverAddr, _ := c.selector.PickServer(key) - level.Debug(c.logger).Log( - "msg", "failed to store item to memcached", - "key", key, - "sizeBytes", len(value), - "server", serverAddr, - "err", err, - ) + if errors.Is(err, gobreaker.ErrOpenState) || errors.Is(err, gobreaker.ErrTooManyRequests) { + level.Warn(c.logger).Log( + "msg", "circuit breaker disallows storing item in memcached", + "key", key, + "err", err) + } else { + // If the PickServer will fail for any reason the server address will be nil + // and so missing in the logs. We're OK with that (it's a best effort). + serverAddr, _ := c.selector.PickServer(key) + level.Debug(c.logger).Log( + "msg", "failed to store item to memcached", + "key", key, + "sizeBytes", len(value), + "server", serverAddr, + "err", err, + ) + } c.trackError(opSet, err) return } diff --git a/pkg/cacheutil/memcached_client_test.go b/pkg/cacheutil/memcached_client_test.go index 4aa355deaa..cac450ef9e 100644 --- a/pkg/cacheutil/memcached_client_test.go +++ b/pkg/cacheutil/memcached_client_test.go @@ -7,6 +7,7 @@ import ( "context" "fmt" "net" + "strconv" "sync" "testing" "time" @@ -16,9 +17,11 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" prom_testutil "github.com/prometheus/client_golang/prometheus/testutil" + "github.com/sony/gobreaker" "go.uber.org/atomic" "github.com/efficientgo/core/testutil" + "github.com/thanos-io/thanos/pkg/gate" "github.com/thanos-io/thanos/pkg/model" ) @@ -59,6 +62,44 @@ func TestMemcachedClientConfig_validate(t *testing.T) { }, expected: errMemcachedDNSUpdateIntervalNotPositive, }, + "should fail on circuit_breaker_consecutive_failures = 0": { + config: MemcachedClientConfig{ + Addresses: []string{"127.0.0.1:11211"}, + MaxAsyncConcurrency: 1, + DNSProviderUpdateInterval: time.Second, + SetAsyncCircuitBreaker: CircuitBreakerConfig{ + Enabled: true, + ConsecutiveFailures: 0, + }, + }, + expected: errCircuitBreakerConsecutiveFailuresNotPositive, + }, + "should fail on circuit_breaker_failure_percent <= 0": { + config: MemcachedClientConfig{ + Addresses: []string{"127.0.0.1:11211"}, + MaxAsyncConcurrency: 1, + DNSProviderUpdateInterval: time.Second, + SetAsyncCircuitBreaker: CircuitBreakerConfig{ + Enabled: true, + ConsecutiveFailures: 1, + FailurePercent: 0, + }, + }, + expected: errCircuitBreakerFailurePercentInvalid, + }, + "should fail on circuit_breaker_failure_percent >= 1": { + config: MemcachedClientConfig{ + Addresses: []string{"127.0.0.1:11211"}, + MaxAsyncConcurrency: 1, + DNSProviderUpdateInterval: time.Second, + SetAsyncCircuitBreaker: CircuitBreakerConfig{ + Enabled: true, + ConsecutiveFailures: 1, + FailurePercent: 1.1, + }, + }, + expected: errCircuitBreakerFailurePercentInvalid, + }, } for testName, testData := range tests { @@ -491,6 +532,9 @@ type memcachedClientBackendMock struct { items map[string]*memcache.Item getMultiCount int getMultiErrors int + + setCount int + setErrors int } func newMemcachedClientBackendMock() *memcachedClientBackendMock { @@ -522,17 +566,30 @@ func (c *memcachedClientBackendMock) Set(item *memcache.Item) error { c.lock.Lock() defer c.lock.Unlock() + c.setCount++ + if c.setCount <= c.setErrors { + return errors.New("mocked Set error") + } + c.items[item.Key] = item return nil } +func (c *memcachedClientBackendMock) waitSetCount(expected int) error { + return c.waitFor(expected, "the number of set operations", func() int { return c.setCount }) +} + func (c *memcachedClientBackendMock) waitItems(expected int) error { + return c.waitFor(expected, "items", func() int { return len(c.items) }) +} + +func (c *memcachedClientBackendMock) waitFor(expected int, name string, valueFunc func() int) error { deadline := time.Now().Add(1 * time.Second) for time.Now().Before(deadline) { c.lock.Lock() - count := len(c.items) + count := valueFunc() c.lock.Unlock() if count >= expected { @@ -540,7 +597,7 @@ func (c *memcachedClientBackendMock) waitItems(expected int) error { } } - return errors.New("timeout expired while waiting for items in the memcached mock") + return fmt.Errorf("timeout expired while waiting for %s in the memcached mock", name) } // countingGate implements gate.Gate and counts the number of times Start is called. @@ -630,3 +687,79 @@ func (c *memcachedClientBlockingMock) GetMulti([]string) (map[string]*memcache.I func (c *memcachedClientBlockingMock) Set(*memcache.Item) error { return nil } + +func TestMemcachedClient_SetAsync_CircuitBreaker(t *testing.T) { + for _, testdata := range []struct { + name string + setErrors int + minRequests uint32 + consecutiveFailures uint32 + failurePercent float64 + expectCircuitBreakerOpen bool + }{ + { + name: "remains closed due to min requests not satisfied", + setErrors: 10, + minRequests: 100, + consecutiveFailures: 1, + failurePercent: 0.00001, + expectCircuitBreakerOpen: false, + }, + { + name: "opened because too many consecutive failures", + setErrors: 10, + minRequests: 10, + consecutiveFailures: 10, + failurePercent: 1, + expectCircuitBreakerOpen: true, + }, + { + name: "opened because failure percent too high", + setErrors: 10, + minRequests: 10, + consecutiveFailures: 100, + failurePercent: 0.1, + expectCircuitBreakerOpen: true, + }, + } { + t.Run(testdata.name, func(t *testing.T) { + config := defaultMemcachedClientConfig + config.Addresses = []string{"127.0.0.1:11211"} + config.SetAsyncCircuitBreaker.Enabled = true + config.SetAsyncCircuitBreaker.OpenDuration = 2 * time.Millisecond + config.SetAsyncCircuitBreaker.HalfOpenMaxRequests = 100 + config.SetAsyncCircuitBreaker.MinRequests = testdata.minRequests + config.SetAsyncCircuitBreaker.ConsecutiveFailures = testdata.consecutiveFailures + config.SetAsyncCircuitBreaker.FailurePercent = testdata.failurePercent + + backendMock := newMemcachedClientBackendMock() + backendMock.setErrors = testdata.setErrors + + client, err := prepare(config, backendMock) + testutil.Ok(t, err) + defer client.Stop() + + // Populate memcached with the initial items. + for i := 0; i < testdata.setErrors; i++ { + testutil.Ok(t, client.SetAsync(strconv.Itoa(i), []byte("value"), time.Second)) + } + + testutil.Ok(t, backendMock.waitSetCount(testdata.setErrors)) + cbimpl := client.setAsyncCircuitBreaker.(gobreakerCircuitBreaker).CircuitBreaker + if testdata.expectCircuitBreakerOpen { + // Trigger the state transaction. + time.Sleep(time.Millisecond) + testutil.Ok(t, client.SetAsync(strconv.Itoa(testdata.setErrors), []byte("value"), time.Second)) + testutil.Equals(t, gobreaker.StateOpen, cbimpl.State(), "state should be open") + + time.Sleep(config.SetAsyncCircuitBreaker.OpenDuration) + for i := testdata.setErrors; i < testdata.setErrors+10; i++ { + testutil.Ok(t, client.SetAsync(strconv.Itoa(i), []byte("value"), time.Second)) + } + testutil.Ok(t, backendMock.waitItems(10)) + } else { + testutil.Equals(t, gobreaker.StateClosed, cbimpl.State()) + } + }) + } +} diff --git a/pkg/cacheutil/redis_client.go b/pkg/cacheutil/redis_client.go index 032ed2942d..09e664b4dc 100644 --- a/pkg/cacheutil/redis_client.go +++ b/pkg/cacheutil/redis_client.go @@ -39,6 +39,8 @@ var ( TLSConfig: TLSConfig{}, MaxAsyncConcurrency: 20, MaxAsyncBufferSize: 10000, + + SetAsyncCircuitBreaker: defaultCircuitBreakerConfig, } ) @@ -118,6 +120,9 @@ type RedisClientConfig struct { // MaxAsyncConcurrency specifies the maximum number of SetAsync goroutines. MaxAsyncConcurrency int `yaml:"max_async_concurrency"` + + // SetAsyncCircuitBreaker configures the circuit breaker for SetAsync operations. + SetAsyncCircuitBreaker CircuitBreakerConfig `yaml:"set_async_circuit_breaker_config"` } func (c *RedisClientConfig) validate() error { @@ -131,6 +136,9 @@ func (c *RedisClientConfig) validate() error { } } + if err := c.SetAsyncCircuitBreaker.validate(); err != nil { + return err + } return nil } @@ -150,6 +158,8 @@ type RedisClient struct { durationGetMulti prometheus.Observer p *AsyncOperationProcessor + + setAsyncCircuitBreaker CircuitBreaker } // NewRedisClient makes a new RedisClient. @@ -232,7 +242,9 @@ func NewRedisClientWithConfig(logger log.Logger, name string, config RedisClient config.MaxSetMultiConcurrency, gate.Sets, ), + setAsyncCircuitBreaker: newCircuitBreaker("redis-set-async", config.SetAsyncCircuitBreaker), } + duration := promauto.With(reg).NewHistogramVec(prometheus.HistogramOpts{ Name: "thanos_redis_operation_duration_seconds", Help: "Duration of operations against redis.", @@ -249,7 +261,10 @@ func NewRedisClientWithConfig(logger log.Logger, name string, config RedisClient func (c *RedisClient) SetAsync(key string, value []byte, ttl time.Duration) error { return c.p.EnqueueAsync(func() { start := time.Now() - if err := c.client.Do(context.Background(), c.client.B().Set().Key(key).Value(rueidis.BinaryString(value)).ExSeconds(int64(ttl.Seconds())).Build()).Error(); err != nil { + err := c.setAsyncCircuitBreaker.Execute(func() error { + return c.client.Do(context.Background(), c.client.B().Set().Key(key).Value(rueidis.BinaryString(value)).ExSeconds(int64(ttl.Seconds())).Build()).Error() + }) + if err != nil { level.Warn(c.logger).Log("msg", "failed to set item into redis", "err", err, "key", key, "value_size", len(value)) return } diff --git a/pkg/cacheutil/redis_client_test.go b/pkg/cacheutil/redis_client_test.go index dcdb714012..938d4337fc 100644 --- a/pkg/cacheutil/redis_client_test.go +++ b/pkg/cacheutil/redis_client_test.go @@ -138,6 +138,7 @@ func TestRedisClient(t *testing.T) { } func TestValidateRedisConfig(t *testing.T) { + addr := "127.0.0.1:6789" tests := []struct { name string config func() RedisClientConfig @@ -147,7 +148,7 @@ func TestValidateRedisConfig(t *testing.T) { name: "simpleConfig", config: func() RedisClientConfig { cfg := DefaultRedisClientConfig - cfg.Addr = "127.0.0.1:6789" + cfg.Addr = addr cfg.Username = "user" cfg.Password = "1234" return cfg @@ -158,7 +159,7 @@ func TestValidateRedisConfig(t *testing.T) { name: "tlsConfigDefaults", config: func() RedisClientConfig { cfg := DefaultRedisClientConfig - cfg.Addr = "127.0.0.1:6789" + cfg.Addr = addr cfg.Username = "user" cfg.Password = "1234" cfg.TLSEnabled = true @@ -170,7 +171,7 @@ func TestValidateRedisConfig(t *testing.T) { name: "tlsClientCertConfig", config: func() RedisClientConfig { cfg := DefaultRedisClientConfig - cfg.Addr = "127.0.0.1:6789" + cfg.Addr = addr cfg.Username = "user" cfg.Password = "1234" cfg.TLSEnabled = true @@ -186,7 +187,7 @@ func TestValidateRedisConfig(t *testing.T) { name: "tlsInvalidClientCertConfig", config: func() RedisClientConfig { cfg := DefaultRedisClientConfig - cfg.Addr = "127.0.0.1:6789" + cfg.Addr = addr cfg.Username = "user" cfg.Password = "1234" cfg.TLSEnabled = true @@ -197,6 +198,39 @@ func TestValidateRedisConfig(t *testing.T) { }, expect_err: true, }, + { + name: "SetAsyncCircuitBreakerDisabled", + config: func() RedisClientConfig { + cfg := DefaultRedisClientConfig + cfg.Addr = addr + cfg.SetAsyncCircuitBreaker.Enabled = false + cfg.SetAsyncCircuitBreaker.ConsecutiveFailures = 0 + return cfg + }, + expect_err: false, + }, + { + name: "invalidCircuitBreakerFailurePercent", + config: func() RedisClientConfig { + cfg := DefaultRedisClientConfig + cfg.Addr = addr + cfg.SetAsyncCircuitBreaker.Enabled = true + cfg.SetAsyncCircuitBreaker.ConsecutiveFailures = 0 + return cfg + }, + expect_err: true, + }, + { + name: "invalidCircuitBreakerFailurePercent", + config: func() RedisClientConfig { + cfg := DefaultRedisClientConfig + cfg.Addr = addr + cfg.SetAsyncCircuitBreaker.Enabled = true + cfg.SetAsyncCircuitBreaker.FailurePercent = 0 + return cfg + }, + expect_err: true, + }, } for _, tt := range tests {