Rollback wait stability max/min duration

Signed-off-by: SungJin1212 <[email protected]>

Author: SungJin1212

docs/blocks-storage/store-gateway.md

@@ -311,13 +311,13 @@ store_gateway:
 
     # Minimum time to wait for ring stability at startup. 0 to disable.
     # CLI flag: -store-gateway.sharding-ring.wait-stability-min-duration
-    [wait_stability_min_duration: <duration> | default = 0s]
+    [wait_stability_min_duration: <duration> | default = 1m]
 
     # Maximum time to wait for ring stability at startup. If the store-gateway
     # ring keeps changing after this period of time, the store-gateway will
     # start anyway.
     # CLI flag: -store-gateway.sharding-ring.wait-stability-max-duration
-    [wait_stability_max_duration: <duration> | default = 5s]
+    [wait_stability_max_duration: <duration> | default = 5m]
 
     # Timeout for waiting on store-gateway to become desired state in the ring.
     # CLI flag: -store-gateway.sharding-ring.wait-instance-state-timeout

docs/configuration/config-file-reference.md

@@ -6467,13 +6467,13 @@ sharding_ring:
 
   # Minimum time to wait for ring stability at startup. 0 to disable.
   # CLI flag: -store-gateway.sharding-ring.wait-stability-min-duration
-  [wait_stability_min_duration: <duration> | default = 0s]
+  [wait_stability_min_duration: <duration> | default = 1m]
 
   # Maximum time to wait for ring stability at startup. If the store-gateway
   # ring keeps changing after this period of time, the store-gateway will start
   # anyway.
   # CLI flag: -store-gateway.sharding-ring.wait-stability-max-duration
-  [wait_stability_max_duration: <duration> | default = 5s]
+  [wait_stability_max_duration: <duration> | default = 5m]
 
   # Timeout for waiting on store-gateway to become desired state in the ring.
   # CLI flag: -store-gateway.sharding-ring.wait-instance-state-timeout

pkg/storegateway/gateway_ring.go

@@ -111,8 +111,8 @@ func (cfg *RingConfig) RegisterFlags(f *flag.FlagSet) {
 	f.BoolVar(&cfg.DetailedMetricsEnabled, ringFlagsPrefix+"detailed-metrics-enabled", true, "Set to true to enable ring detailed metrics. These metrics provide detailed information, such as token count and ownership per tenant. Disabling them can significantly decrease the number of metrics emitted.")
 
 	// Wait stability flags.
-	f.DurationVar(&cfg.WaitStabilityMinDuration, ringFlagsPrefix+"wait-stability-min-duration", 0, "Minimum time to wait for ring stability at startup. 0 to disable.")
-	f.DurationVar(&cfg.WaitStabilityMaxDuration, ringFlagsPrefix+"wait-stability-max-duration", 5*time.Second, "Maximum time to wait for ring stability at startup. If the store-gateway ring keeps changing after this period of time, the store-gateway will start anyway.")
+	f.DurationVar(&cfg.WaitStabilityMinDuration, ringFlagsPrefix+"wait-stability-min-duration", time.Minute, "Minimum time to wait for ring stability at startup. 0 to disable.")
+	f.DurationVar(&cfg.WaitStabilityMaxDuration, ringFlagsPrefix+"wait-stability-max-duration", 5*time.Minute, "Maximum time to wait for ring stability at startup. If the store-gateway ring keeps changing after this period of time, the store-gateway will start anyway.")
 
 	f.DurationVar(&cfg.FinalSleep, ringFlagsPrefix+"final-sleep", 0*time.Second, "The sleep seconds when store-gateway is shutting down. Need to be close to or larger than KV Store information propagation delay")
 

schemas/cortex-config-schema.json

@@ -8287,14 +8287,14 @@
               "x-format": "duration"
             },
             "wait_stability_max_duration": {
-              "default": "5s",
+              "default": "5m0s",
               "description": "Maximum time to wait for ring stability at startup. If the store-gateway ring keeps changing after this period of time, the store-gateway will start anyway.",
               "type": "string",
               "x-cli-flag": "store-gateway.sharding-ring.wait-stability-max-duration",
               "x-format": "duration"
             },
             "wait_stability_min_duration": {
-              "default": "0s",
+              "default": "1m0s",
               "description": "Minimum time to wait for ring stability at startup. 0 to disable.",
               "type": "string",
               "x-cli-flag": "store-gateway.sharding-ring.wait-stability-min-duration",