From 6a8dced4ccf36dce812ba020d3cf06608cbbb5ba Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Tue, 13 Aug 2024 15:48:27 -0700 Subject: [PATCH 1/3] always use zone stable shuffle sharding for store gateway Signed-off-by: Ben Ye --- docs/blocks-storage/store-gateway.md | 2 +- pkg/storegateway/gateway_ring.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/blocks-storage/store-gateway.md b/docs/blocks-storage/store-gateway.md index 6c31046b1f..32bc836ca2 100644 --- a/docs/blocks-storage/store-gateway.md +++ b/docs/blocks-storage/store-gateway.md @@ -66,7 +66,7 @@ The **`zone-stable-shuffle-sharding`** strategy achieves the same as the **`shuf Zone stable shuffle sharding can be enabled via `-store-gateway.sharding-ring.zone-stable-shuffle-sharding` CLI flag. -It will become the default shuffle sharding strategy for store gateway in `v1.17.0` release and the previous shuffle sharding algorithm will be removed in `v1.18.0` release. +It will become the default shuffle sharding strategy for store gateway in `v1.18.0` release and the previous shuffle sharding algorithm will be removed in `v1.19.0` release. _Please check out the [shuffle sharding documentation](../guides/shuffle-sharding.md) for more information about how it works._ diff --git a/pkg/storegateway/gateway_ring.go b/pkg/storegateway/gateway_ring.go index 8965c32f95..fc39f80b42 100644 --- a/pkg/storegateway/gateway_ring.go +++ b/pkg/storegateway/gateway_ring.go @@ -106,7 +106,7 @@ func (cfg *RingConfig) RegisterFlags(f *flag.FlagSet) { f.StringVar(&cfg.TokensFilePath, ringFlagsPrefix+"tokens-file-path", "", "File path where tokens are stored. If empty, tokens are not stored at shutdown and restored at startup.") f.BoolVar(&cfg.ZoneAwarenessEnabled, ringFlagsPrefix+"zone-awareness-enabled", false, "True to enable zone-awareness and replicate blocks across different availability zones.") f.BoolVar(&cfg.KeepInstanceInTheRingOnShutdown, ringFlagsPrefix+"keep-instance-in-the-ring-on-shutdown", false, "True to keep the store gateway instance in the ring when it shuts down. The instance will then be auto-forgotten from the ring after 10*heartbeat_timeout.") - f.BoolVar(&cfg.ZoneStableShuffleSharding, ringFlagsPrefix+"zone-stable-shuffle-sharding", false, "If true, use zone stable shuffle sharding algorithm. Otherwise, use the default shuffle sharding algorithm.") + f.BoolVar(&cfg.ZoneStableShuffleSharding, ringFlagsPrefix+"zone-stable-shuffle-sharding", true, "If true, use zone stable shuffle sharding algorithm. Otherwise, use the default shuffle sharding algorithm.") // Wait stability flags. f.DurationVar(&cfg.WaitStabilityMinDuration, ringFlagsPrefix+"wait-stability-min-duration", time.Minute, "Minimum time to wait for ring stability at startup. 0 to disable.") From abab0449606f4d9d7bd4db1a603b41d093980a10 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Tue, 13 Aug 2024 23:13:15 +0000 Subject: [PATCH 2/3] update doc Signed-off-by: Ben Ye --- docs/blocks-storage/store-gateway.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/blocks-storage/store-gateway.md b/docs/blocks-storage/store-gateway.md index 32bc836ca2..6c31046b1f 100644 --- a/docs/blocks-storage/store-gateway.md +++ b/docs/blocks-storage/store-gateway.md @@ -66,7 +66,7 @@ The **`zone-stable-shuffle-sharding`** strategy achieves the same as the **`shuf Zone stable shuffle sharding can be enabled via `-store-gateway.sharding-ring.zone-stable-shuffle-sharding` CLI flag. -It will become the default shuffle sharding strategy for store gateway in `v1.18.0` release and the previous shuffle sharding algorithm will be removed in `v1.19.0` release. +It will become the default shuffle sharding strategy for store gateway in `v1.17.0` release and the previous shuffle sharding algorithm will be removed in `v1.18.0` release. _Please check out the [shuffle sharding documentation](../guides/shuffle-sharding.md) for more information about how it works._ From 25c6e679db4e72edd0f48bab8204e9dbdd145592 Mon Sep 17 00:00:00 2001 From: Ben Ye Date: Tue, 13 Aug 2024 23:15:30 +0000 Subject: [PATCH 3/3] changelog Signed-off-by: Ben Ye --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e182810d1..20461d7e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ * [CHANGE] Ruler: Scheduling `ruler.evaluation-delay-duration` to be deprecated. Use the highest value between `ruler.evaluation-delay-duration` and `ruler.query-offset` #6149 * [CHANGE] Querier: Remove `-querier.at-modifier-enabled` flag. #6157 * [CHANGE] Tracing: Remove deprecated `oltp_endpoint` config entirely. #6158 +* [CHANGE] Store Gateway: Enable store gateway zone stable shuffle sharding by default. #6161 * [FEATURE] Ingester/Distributor: Experimental: Enable native histogram ingestion via `-blocks-storage.tsdb.enable-native-histograms` flag. #5986 #6010 #6020 * [FEATURE] Querier: Enable querying native histogram chunks. #5944 #6031 * [FEATURE] Query Frontend: Support native histogram in query frontend response. #5996 #6043