Skip to content

Commit 45a4b8e

Browse files
yeya24yeya24
authored
Always turn on ingester query streaming and mark its flag as deprecated (#5817)
* always turn on ingester query streaming and mark its flag as deprecated Signed-off-by: Ben Ye <[email protected]> * lint Signed-off-by: Ben Ye <[email protected]> * fix lint Signed-off-by: Ben Ye <[email protected]> * update changelog Signed-off-by: Ben Ye <[email protected]> --------- Signed-off-by: Ben Ye <[email protected]>
1 parent 59ba788 commit 45a4b8e

14 files changed

+240
-613
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* [CHANGE] Ingester: Disable uploading compacted blocks and overlapping compaction in ingester. #5735
88
* [CHANGE] Distributor: Count the number of rate-limited samples in `distributor_samples_in_total`. #5714
99
* [CHANGE] Ruler: Remove `cortex_ruler_write_requests_total`, `cortex_ruler_write_requests_failed_total`, `cortex_ruler_queries_total`, `cortex_ruler_queries_failed_total`, and `cortex_ruler_query_seconds_total` metrics for the tenant when the ruler deletes the manager for the tenant. #5772
10+
* [CHANGE] Querier: Mark `-querier.ingester-streaming` flag as deprecated. Now query ingester streaming is always enabled. #5817
1011
* [FEATURE] Ingester: Add per-tenant new metric `cortex_ingester_tsdb_data_replay_duration_seconds`. #5477
1112
* [FEATURE] Query Frontend/Scheduler: Add query priority support. #5605
1213
* [FEATURE] Tracing: Add `kuberesolver` to resolve endpoints address with `kubernetes://` prefix as Kubernetes service. #5731

‎docs/blocks-storage/querier.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,6 @@ querier:
114114
# CLI flag: -querier.batch-iterators
115115
[batch_iterators: <boolean> | default = true]
116116

117-
# Use streaming RPCs to query ingester.
118-
# CLI flag: -querier.ingester-streaming
119-
[ingester_streaming: <boolean> | default = true]
120-
121117
# Use streaming RPCs for metadata APIs from ingester.
122118
# CLI flag: -querier.ingester-metadata-streaming
123119
[ingester_metadata_streaming: <boolean> | default = false]

‎docs/configuration/config-file-reference.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3596,10 +3596,6 @@ The `querier_config` configures the Cortex querier.
35963596
# CLI flag: -querier.batch-iterators
35973597
[batch_iterators: <boolean> | default = true]
35983598
3599-
# Use streaming RPCs to query ingester.
3600-
# CLI flag: -querier.ingester-streaming
3601-
[ingester_streaming: <boolean> | default = true]
3602-
36033599
# Use streaming RPCs for metadata APIs from ingester.
36043600
# CLI flag: -querier.ingester-metadata-streaming
36053601
[ingester_metadata_streaming: <boolean> | default = false]

‎integration/querier_test.go

Lines changed: 79 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -27,87 +27,70 @@ import (
2727

2828
func TestQuerierWithBlocksStorageRunningInMicroservicesMode(t *testing.T) {
2929
tests := map[string]struct {
30-
blocksShardingStrategy string // Empty means sharding is disabled.
31-
tenantShardSize int
32-
ingesterStreamingEnabled bool
33-
indexCacheBackend string
34-
chunkCacheBackend string
35-
bucketIndexEnabled bool
30+
blocksShardingStrategy string // Empty means sharding is disabled.
31+
tenantShardSize int
32+
indexCacheBackend string
33+
chunkCacheBackend string
34+
bucketIndexEnabled bool
3635
}{
37-
"blocks sharding disabled, ingester gRPC streaming disabled, memcached index cache": {
38-
blocksShardingStrategy: "",
39-
ingesterStreamingEnabled: false,
40-
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
41-
chunkCacheBackend: tsdb.CacheBackendMemcached,
36+
"blocks sharding disabled, memcached index cache": {
37+
blocksShardingStrategy: "",
38+
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
39+
chunkCacheBackend: tsdb.CacheBackendMemcached,
4240
},
43-
"blocks sharding disabled, ingester gRPC streaming disabled, multilevel index cache (inmemory, memcached)": {
44-
blocksShardingStrategy: "",
45-
ingesterStreamingEnabled: false,
46-
indexCacheBackend: fmt.Sprintf("%v,%v", tsdb.IndexCacheBackendInMemory, tsdb.IndexCacheBackendMemcached),
47-
chunkCacheBackend: tsdb.CacheBackendMemcached,
41+
"blocks sharding disabled, multilevel index cache (inmemory, memcached)": {
42+
blocksShardingStrategy: "",
43+
indexCacheBackend: fmt.Sprintf("%v,%v", tsdb.IndexCacheBackendInMemory, tsdb.IndexCacheBackendMemcached),
44+
chunkCacheBackend: tsdb.CacheBackendMemcached,
4845
},
49-
"blocks sharding disabled, ingester gRPC streaming disabled, redis index cache": {
50-
blocksShardingStrategy: "",
51-
ingesterStreamingEnabled: false,
52-
indexCacheBackend: tsdb.IndexCacheBackendRedis,
53-
chunkCacheBackend: tsdb.CacheBackendRedis,
46+
"blocks sharding disabled, redis index cache": {
47+
blocksShardingStrategy: "",
48+
indexCacheBackend: tsdb.IndexCacheBackendRedis,
49+
chunkCacheBackend: tsdb.CacheBackendRedis,
5450
},
55-
"blocks sharding disabled, ingester gRPC streaming disabled, multilevel index cache (inmemory, redis)": {
56-
blocksShardingStrategy: "",
57-
ingesterStreamingEnabled: false,
58-
indexCacheBackend: fmt.Sprintf("%v,%v", tsdb.IndexCacheBackendInMemory, tsdb.IndexCacheBackendRedis),
59-
chunkCacheBackend: tsdb.CacheBackendRedis,
51+
"blocks sharding disabled, multilevel index cache (inmemory, redis)": {
52+
blocksShardingStrategy: "",
53+
indexCacheBackend: fmt.Sprintf("%v,%v", tsdb.IndexCacheBackendInMemory, tsdb.IndexCacheBackendRedis),
54+
chunkCacheBackend: tsdb.CacheBackendRedis,
6055
},
61-
"blocks default sharding, ingester gRPC streaming disabled, inmemory index cache": {
62-
blocksShardingStrategy: "default",
63-
ingesterStreamingEnabled: false,
64-
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
56+
"blocks default sharding, inmemory index cache": {
57+
blocksShardingStrategy: "default",
58+
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
6559
},
66-
"blocks default sharding, ingester gRPC streaming enabled, inmemory index cache": {
67-
blocksShardingStrategy: "default",
68-
ingesterStreamingEnabled: true,
69-
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
60+
"blocks default sharding, memcached index cache": {
61+
blocksShardingStrategy: "default",
62+
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
63+
chunkCacheBackend: tsdb.CacheBackendMemcached,
7064
},
71-
"blocks default sharding, ingester gRPC streaming enabled, memcached index cache": {
72-
blocksShardingStrategy: "default",
73-
ingesterStreamingEnabled: true,
74-
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
75-
chunkCacheBackend: tsdb.CacheBackendMemcached,
65+
"blocks shuffle sharding, memcached index cache": {
66+
blocksShardingStrategy: "shuffle-sharding",
67+
tenantShardSize: 1,
68+
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
69+
chunkCacheBackend: tsdb.CacheBackendMemcached,
7670
},
77-
"blocks shuffle sharding, ingester gRPC streaming enabled, memcached index cache": {
78-
blocksShardingStrategy: "shuffle-sharding",
79-
tenantShardSize: 1,
80-
ingesterStreamingEnabled: true,
81-
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
82-
chunkCacheBackend: tsdb.CacheBackendMemcached,
71+
"blocks default sharding, inmemory index cache, bucket index enabled": {
72+
blocksShardingStrategy: "default",
73+
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
74+
bucketIndexEnabled: true,
8375
},
84-
"blocks default sharding, ingester gRPC streaming enabled, inmemory index cache, bucket index enabled": {
85-
blocksShardingStrategy: "default",
86-
ingesterStreamingEnabled: true,
87-
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
88-
bucketIndexEnabled: true,
76+
"blocks shuffle sharding, memcached index cache, bucket index enabled": {
77+
blocksShardingStrategy: "shuffle-sharding",
78+
tenantShardSize: 1,
79+
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
80+
bucketIndexEnabled: true,
8981
},
90-
"blocks shuffle sharding, ingester gRPC streaming enabled, memcached index cache, bucket index enabled": {
91-
blocksShardingStrategy: "shuffle-sharding",
92-
tenantShardSize: 1,
93-
ingesterStreamingEnabled: true,
94-
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
95-
bucketIndexEnabled: true,
82+
"blocks default sharding, redis index cache, bucket index enabled": {
83+
blocksShardingStrategy: "default",
84+
indexCacheBackend: tsdb.IndexCacheBackendRedis,
85+
chunkCacheBackend: tsdb.CacheBackendRedis,
86+
bucketIndexEnabled: true,
9687
},
97-
"blocks default sharding, ingester gRPC streaming enabled, redis index cache, bucket index enabled": {
98-
blocksShardingStrategy: "default",
99-
ingesterStreamingEnabled: true,
100-
indexCacheBackend: tsdb.IndexCacheBackendRedis,
101-
chunkCacheBackend: tsdb.CacheBackendRedis,
102-
bucketIndexEnabled: true,
103-
},
104-
"blocks shuffle sharding, ingester gRPC streaming enabled, redis index cache, bucket index enabled": {
105-
blocksShardingStrategy: "shuffle-sharding",
106-
tenantShardSize: 1,
107-
ingesterStreamingEnabled: true,
108-
indexCacheBackend: tsdb.IndexCacheBackendRedis,
109-
chunkCacheBackend: tsdb.CacheBackendRedis,
110-
bucketIndexEnabled: true,
88+
"blocks shuffle sharding, redis index cache, bucket index enabled": {
89+
blocksShardingStrategy: "shuffle-sharding",
90+
tenantShardSize: 1,
91+
indexCacheBackend: tsdb.IndexCacheBackendRedis,
92+
chunkCacheBackend: tsdb.CacheBackendRedis,
93+
bucketIndexEnabled: true,
11194
},
11295
}
11396

@@ -134,7 +117,6 @@ func TestQuerierWithBlocksStorageRunningInMicroservicesMode(t *testing.T) {
134117
"-store-gateway.sharding-enabled": strconv.FormatBool(testCfg.blocksShardingStrategy != ""),
135118
"-store-gateway.sharding-strategy": testCfg.blocksShardingStrategy,
136119
"-store-gateway.tenant-shard-size": fmt.Sprintf("%d", testCfg.tenantShardSize),
137-
"-querier.ingester-streaming": strconv.FormatBool(testCfg.ingesterStreamingEnabled),
138120
"-querier.query-store-for-labels-enabled": "true",
139121
"-querier.thanos-engine": strconv.FormatBool(thanosEngine),
140122
"-blocks-storage.bucket-store.bucket-index.enabled": strconv.FormatBool(testCfg.bucketIndexEnabled),
@@ -319,52 +301,39 @@ func TestQuerierWithBlocksStorageRunningInMicroservicesMode(t *testing.T) {
319301

320302
func TestQuerierWithBlocksStorageRunningInSingleBinaryMode(t *testing.T) {
321303
tests := map[string]struct {
322-
blocksShardingEnabled bool
323-
ingesterStreamingEnabled bool
324-
indexCacheBackend string
325-
bucketIndexEnabled bool
304+
blocksShardingEnabled bool
305+
indexCacheBackend string
306+
bucketIndexEnabled bool
326307
}{
327-
"blocks sharding enabled, ingester gRPC streaming disabled, inmemory index cache": {
328-
blocksShardingEnabled: true,
329-
ingesterStreamingEnabled: false,
330-
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
331-
},
332-
"blocks sharding enabled, ingester gRPC streaming enabled, inmemory index cache": {
333-
blocksShardingEnabled: true,
334-
ingesterStreamingEnabled: true,
335-
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
308+
"blocks sharding enabled, inmemory index cache": {
309+
blocksShardingEnabled: true,
310+
indexCacheBackend: tsdb.IndexCacheBackendInMemory,
336311
},
337-
"blocks sharding disabled, ingester gRPC streaming disabled, memcached index cache": {
338-
blocksShardingEnabled: false,
339-
ingesterStreamingEnabled: false,
340-
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
312+
"blocks sharding disabled, memcached index cache": {
313+
blocksShardingEnabled: false,
314+
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
341315
},
342-
"blocks sharding enabled, ingester gRPC streaming enabled, memcached index cache": {
343-
blocksShardingEnabled: true,
344-
ingesterStreamingEnabled: true,
345-
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
316+
"blocks sharding enabled, memcached index cache": {
317+
blocksShardingEnabled: true,
318+
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
346319
},
347-
"blocks sharding enabled, ingester gRPC streaming enabled, memcached index cache, bucket index enabled": {
348-
blocksShardingEnabled: true,
349-
ingesterStreamingEnabled: true,
350-
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
351-
bucketIndexEnabled: true,
320+
"blocks sharding enabled, memcached index cache, bucket index enabled": {
321+
blocksShardingEnabled: true,
322+
indexCacheBackend: tsdb.IndexCacheBackendMemcached,
323+
bucketIndexEnabled: true,
352324
},
353-
"blocks sharding disabled, ingester gRPC streaming disabled, redis index cache": {
354-
blocksShardingEnabled: false,
355-
ingesterStreamingEnabled: false,
356-
indexCacheBackend: tsdb.IndexCacheBackendRedis,
325+
"blocks sharding disabled,redis index cache": {
326+
blocksShardingEnabled: false,
327+
indexCacheBackend: tsdb.IndexCacheBackendRedis,
357328
},
358-
"blocks sharding enabled, ingester gRPC streaming enabled, redis index cache": {
359-
blocksShardingEnabled: true,
360-
ingesterStreamingEnabled: true,
361-
indexCacheBackend: tsdb.IndexCacheBackendRedis,
329+
"blocks sharding enabled, redis index cache": {
330+
blocksShardingEnabled: true,
331+
indexCacheBackend: tsdb.IndexCacheBackendRedis,
362332
},
363-
"blocks sharding enabled, ingester gRPC streaming enabled, redis index cache, bucket index enabled": {
364-
blocksShardingEnabled: true,
365-
ingesterStreamingEnabled: true,
366-
indexCacheBackend: tsdb.IndexCacheBackendRedis,
367-
bucketIndexEnabled: true,
333+
"blocks sharding enabled, redis index cache, bucket index enabled": {
334+
blocksShardingEnabled: true,
335+
indexCacheBackend: tsdb.IndexCacheBackendRedis,
336+
bucketIndexEnabled: true,
368337
},
369338
}
370339

@@ -398,7 +367,6 @@ func TestQuerierWithBlocksStorageRunningInSingleBinaryMode(t *testing.T) {
398367
"-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(),
399368
"-blocks-storage.bucket-store.index-cache.backend": testCfg.indexCacheBackend,
400369
"-blocks-storage.bucket-store.bucket-index.enabled": strconv.FormatBool(testCfg.bucketIndexEnabled),
401-
"-querier.ingester-streaming": strconv.FormatBool(testCfg.ingesterStreamingEnabled),
402370
"-querier.query-store-for-labels-enabled": "true",
403371
"-querier.thanos-engine": strconv.FormatBool(thanosEngine),
404372
// Ingester.
@@ -1041,7 +1009,6 @@ func TestQueryLimitsWithBlocksStorageRunningInMicroServices(t *testing.T) {
10411009
"-blocks-storage.tsdb.ship-interval": "1s",
10421010
"-blocks-storage.bucket-store.sync-interval": "1s",
10431011
"-blocks-storage.tsdb.retention-period": ((blockRangePeriod * 2) - 1).String(),
1044-
"-querier.ingester-streaming": "true",
10451012
"-querier.query-store-for-labels-enabled": "true",
10461013
"-querier.max-fetched-series-per-query": "3",
10471014
})

‎pkg/chunk/chunk_test.go

Lines changed: 0 additions & 105 deletions
This file was deleted.

0 commit comments

Comments
 (0)