Rolledback compactor blocks sharding (#2628)

* Rolledback compactor blocks sharding

Signed-off-by: Marco Pracucci <[email protected]>

* Fixes

Signed-off-by: Marco Pracucci <[email protected]>

Author: pracucci

CHANGELOG.md

@@ -29,7 +29,6 @@
   * `cortex_storegateway_blocks_last_successful_sync_timestamp_seconds`
 * [ENHANCEMENT] Experimental TSDB: added the flag `-experimental.tsdb.wal-compression-enabled` to allow to enable TSDB WAL compression. #2585
 * [ENHANCEMENT] Experimental TSDB: Querier and store-gateway components can now use so-called "caching bucket", which can currently cache fetched chunks into shared memcached server. #2572
-* [ENHANCEMENT] Experimental TSDB: added per-tenant blocks sharding support in the compactor, in order to parallelize blocks compaction for a single tenant in a single node. Sharding can be enabled via `-compactor.per-tenant-num-shards` while the parallelization can be controlled with `-compactor.per-tenant-shards-concurrency`. #2599
 * [ENHANCEMENT] Ruler: Automatically remove unhealthy rulers from the ring. #2587
 * [ENHANCEMENT] `query-tee` supports `/metadata`, `/alerts`, and `/rules` #2600
 * [ENHANCEMENT] Thanos and Prometheus upgraded to [806479182a6b](https://github.com/thanos-io/thanos/commit/806479182a6b) and [cd73b3d33e06](https://github.com/prometheus/prometheus/commit/cd73b3d33e06) respectively. #2604

docs/configuration/config-file-reference.md

@@ -3011,7 +3011,7 @@ The `compactor_config` configures the compactor for the experimental blocks stor
 # Malformed blocks older than the maximum of consistency-delay and 48h0m0s will
 # be removed.
 # CLI flag: -compactor.consistency-delay
-[consistency_delay: <duration> | default = 30m]
+[consistency_delay: <duration> | default = 0s]
 
 # Data directory in which to cache blocks and process compactions
 # CLI flag: -compactor.data-dir
@@ -3026,6 +3026,10 @@ The `compactor_config` configures the compactor for the experimental blocks stor
 # CLI flag: -compactor.compaction-retries
 [compaction_retries: <int> | default = 3]
 
+# Max number of concurrent compactions running.
+# CLI flag: -compactor.compaction-concurrency
+[compaction_concurrency: <int> | default = 1]
+
 # Time before a block marked for deletion is deleted from bucket. If not 0,
 # blocks will be marked for deletion and compactor component will delete blocks
 # marked for deletion from the bucket. If delete-delay is 0, blocks will be
@@ -3086,15 +3090,6 @@ sharding_ring:
   # the ring.
   # CLI flag: -compactor.ring.heartbeat-timeout
   [heartbeat_timeout: <duration> | default = 1m]
-
-# Number of shards a single tenant blocks should be grouped into (0 or 1 means
-# per-tenant blocks sharding is disabled).
-# CLI flag: -compactor.per-tenant-num-shards
-[per_tenant_num_shards: <int> | default = 1]
-
-# Number of concurrent shards compacted for a single tenant.
-# CLI flag: -compactor.per-tenant-shards-concurrency
-[per_tenant_shards_concurrency: <int> | default = 1]
 ```
 
 ### `store_gateway_config`

docs/operations/blocks-storage.md

@@ -620,7 +620,7 @@ compactor:
   # Malformed blocks older than the maximum of consistency-delay and 48h0m0s
   # will be removed.
   # CLI flag: -compactor.consistency-delay
-  [consistency_delay: <duration> | default = 30m]
+  [consistency_delay: <duration> | default = 0s]
 
   # Data directory in which to cache blocks and process compactions
   # CLI flag: -compactor.data-dir
@@ -635,6 +635,10 @@ compactor:
   # CLI flag: -compactor.compaction-retries
   [compaction_retries: <int> | default = 3]
 
+  # Max number of concurrent compactions running.
+  # CLI flag: -compactor.compaction-concurrency
+  [compaction_concurrency: <int> | default = 1]
+
   # Time before a block marked for deletion is deleted from bucket. If not 0,
   # blocks will be marked for deletion and compactor component will delete
   # blocks marked for deletion from the bucket. If delete-delay is 0, blocks
@@ -696,15 +700,6 @@ compactor:
     # within the ring.
     # CLI flag: -compactor.ring.heartbeat-timeout
     [heartbeat_timeout: <duration> | default = 1m]
-
-  # Number of shards a single tenant blocks should be grouped into (0 or 1 means
-  # per-tenant blocks sharding is disabled).
-  # CLI flag: -compactor.per-tenant-num-shards
-  [per_tenant_num_shards: <int> | default = 1]
-
-  # Number of concurrent shards compacted for a single tenant.
-  # CLI flag: -compactor.per-tenant-shards-concurrency
-  [per_tenant_shards_concurrency: <int> | default = 1]
 ```
 
 ## Known issues