update changelog

Signed-off-by: Ben Ye <[email protected]>
cortexproject · Jan 28, 2025 · e42b929 · e42b929
1 parent 0f2fd23
commit e42b929
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 19 deletions.
diff --git a/docs/blocks-storage/compactor.md b/docs/blocks-storage/compactor.md
@@ -225,8 +225,7 @@ compactor:
         # CLI flag: -compactor.ring.dynamodb.max-cas-retries
         [max_cas_retries: <int> | default = 10]
 
-        # Timeout of dynamoDbClient requests. By default it is 2 times of
-        # dynamodb.puller-sync-time.
+        # Timeout of dynamoDbClient requests. Default is 2m.
         # CLI flag: -compactor.ring.dynamodb.timeout
         [timeout: <duration> | default = 2m]
 

diff --git a/docs/blocks-storage/store-gateway.md b/docs/blocks-storage/store-gateway.md
@@ -240,8 +240,7 @@ store_gateway:
         # CLI flag: -store-gateway.sharding-ring.dynamodb.max-cas-retries
         [max_cas_retries: <int> | default = 10]
 
-        # Timeout of dynamoDbClient requests. By default it is 2 times of
-        # dynamodb.puller-sync-time.
+        # Timeout of dynamoDbClient requests. Default is 2m.
         # CLI flag: -store-gateway.sharding-ring.dynamodb.timeout
         [timeout: <duration> | default = 2m]
 

diff --git a/docs/configuration/config-file-reference.md b/docs/configuration/config-file-reference.md
@@ -341,8 +341,7 @@ sharding_ring:
       # CLI flag: -alertmanager.sharding-ring.dynamodb.max-cas-retries
       [max_cas_retries: <int> | default = 10]
 
-      # Timeout of dynamoDbClient requests. By default it is 2 times of
-      # dynamodb.puller-sync-time.
+      # Timeout of dynamoDbClient requests. Default is 2m.
       # CLI flag: -alertmanager.sharding-ring.dynamodb.timeout
       [timeout: <duration> | default = 2m]
 
@@ -2291,8 +2290,7 @@ sharding_ring:
       # CLI flag: -compactor.ring.dynamodb.max-cas-retries
       [max_cas_retries: <int> | default = 10]
 
-      # Timeout of dynamoDbClient requests. By default it is 2 times of
-      # dynamodb.puller-sync-time.
+      # Timeout of dynamoDbClient requests. Default is 2m.
       # CLI flag: -compactor.ring.dynamodb.timeout
       [timeout: <duration> | default = 2m]
 
@@ -2605,8 +2603,7 @@ ha_tracker:
       # CLI flag: -distributor.ha-tracker.dynamodb.max-cas-retries
       [max_cas_retries: <int> | default = 10]
 
-      # Timeout of dynamoDbClient requests. By default it is 2 times of
-      # dynamodb.puller-sync-time.
+      # Timeout of dynamoDbClient requests. Default is 2m.
       # CLI flag: -distributor.ha-tracker.dynamodb.timeout
       [timeout: <duration> | default = 2m]
 
@@ -2704,8 +2701,7 @@ ring:
       # CLI flag: -distributor.ring.dynamodb.max-cas-retries
       [max_cas_retries: <int> | default = 10]
 
-      # Timeout of dynamoDbClient requests. By default it is 2 times of
-      # dynamodb.puller-sync-time.
+      # Timeout of dynamoDbClient requests. Default is 2m.
       # CLI flag: -distributor.ring.dynamodb.timeout
       [timeout: <duration> | default = 2m]
 
@@ -3037,8 +3033,7 @@ lifecycler:
         # CLI flag: -dynamodb.max-cas-retries
         [max_cas_retries: <int> | default = 10]
 
-        # Timeout of dynamoDbClient requests. By default it is 2 times of
-        # dynamodb.puller-sync-time.
+        # Timeout of dynamoDbClient requests. Default is 2m.
         # CLI flag: -dynamodb.timeout
         [timeout: <duration> | default = 2m]
 
@@ -4691,8 +4686,7 @@ ring:
       # CLI flag: -ruler.ring.dynamodb.max-cas-retries
       [max_cas_retries: <int> | default = 10]
 
-      # Timeout of dynamoDbClient requests. By default it is 2 times of
-      # dynamodb.puller-sync-time.
+      # Timeout of dynamoDbClient requests. Default is 2m.
       # CLI flag: -ruler.ring.dynamodb.timeout
       [timeout: <duration> | default = 2m]
 
@@ -5687,8 +5681,7 @@ sharding_ring:
       # CLI flag: -store-gateway.sharding-ring.dynamodb.max-cas-retries
       [max_cas_retries: <int> | default = 10]
 
-      # Timeout of dynamoDbClient requests. By default it is 2 times of
-      # dynamodb.puller-sync-time.
+      # Timeout of dynamoDbClient requests. Default is 2m.
       # CLI flag: -store-gateway.sharding-ring.dynamodb.timeout
       [timeout: <duration> | default = 2m]
 

diff --git a/pkg/ring/kv/dynamodb/client.go b/pkg/ring/kv/dynamodb/client.go
@@ -54,7 +54,7 @@ func (cfg *Config) RegisterFlags(f *flag.FlagSet, prefix string) {
 	f.DurationVar(&cfg.TTL, prefix+"dynamodb.ttl-time", 0, "Time to expire items on dynamodb.")
 	f.DurationVar(&cfg.PullerSyncTime, prefix+"dynamodb.puller-sync-time", 60*time.Second, "Time to refresh local ring with information on dynamodb.")
 	f.IntVar(&cfg.MaxCasRetries, prefix+"dynamodb.max-cas-retries", maxCasRetries, "Maximum number of retries for DDB KV CAS.")
-	f.DurationVar(&cfg.Timeout, prefix+"dynamodb.timeout", 2*cfg.PullerSyncTime, "Timeout of dynamoDbClient requests. By default it is 2 times of dynamodb.puller-sync-time.")
+	f.DurationVar(&cfg.Timeout, prefix+"dynamodb.timeout", 2*time.Minute, "Timeout of dynamoDbClient requests. Default is 2m.")
 }
 
 func NewClient(cfg Config, cc codec.Codec, logger log.Logger, registerer prometheus.Registerer) (*Client, error) {