Merge pull request #7815 from fpetkovski/disable-chunk-trimming

Disable chunk trimming in Receivers
thanos-io · Oct 14, 2024 · 2f39d24 · 2f39d24
2 parents d215f5b + a79c710
commit 2f39d24
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 4 deletions.
diff --git a/docs/components/receive.md b/docs/components/receive.md
@@ -94,6 +94,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 

diff --git a/docs/components/sidecar.md b/docs/components/sidecar.md
@@ -74,6 +74,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 

diff --git a/docs/components/store.md b/docs/components/store.md
@@ -33,6 +33,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 

diff --git a/docs/components/tools.md b/docs/components/tools.md
@@ -128,6 +128,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 
@@ -698,6 +699,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 
@@ -800,6 +802,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 

diff --git a/docs/storage.md b/docs/storage.md
@@ -304,6 +304,7 @@ config:
       server_name: ""
       insecure_skip_verify: false
     disable_compression: false
+  chunk_size_bytes: 0
 prefix: ""
 ```
 

diff --git a/pkg/store/storepb/rpc.pb.go b/pkg/store/storepb/rpc.pb.go
diff --git a/pkg/store/storepb/rpc.proto b/pkg/store/storepb/rpc.proto
@@ -33,6 +33,9 @@ service Store {
   ///
   /// There is no requirements on chunk sorting, however it is recommended to have chunk sorted by chunk min time.
   /// This heavily optimizes the resource usage on Querier / Federated Queries.
+  ///
+  /// Chunks can span a range larger than the requested min and max time and it is up to the query engine to discard samples
+  /// which fall outside of the query range.
   rpc Series(SeriesRequest) returns (stream SeriesResponse);
 
   /// LabelNames returns all label names constrained by the given matchers.

diff --git a/pkg/store/tsdb.go b/pkg/store/tsdb.go
@@ -272,9 +272,10 @@ func (s *TSDBStore) Series(r *storepb.SeriesRequest, seriesSrv storepb.Store_Ser
 	}
 
 	hints := &storage.SelectHints{
-		Start: r.MinTime,
-		End:   r.MaxTime,
-		Limit: int(r.Limit),
+		Start:           r.MinTime,
+		End:             r.MaxTime,
+		Limit:           int(r.Limit),
+		DisableTrimming: true,
 	}
 	set := q.Select(srv.Context(), true, hints, matchers...)
 

diff --git a/pkg/store/tsdb_test.go b/pkg/store/tsdb_test.go
@@ -124,7 +124,7 @@ func TestTSDBStore_Series(t *testing.T) {
 			expectedSeries: []rawSeries{
 				{
 					lset:   labels.FromStrings("a", "1", "region", "eu-west"),
-					chunks: [][]sample{{{1, 1}, {2, 2}}},
+					chunks: [][]sample{{{1, 1}, {2, 2}, {3, 3}}},
 				},
 			},
 		},