Skip to content

Commit b4a25e2

Browse files
authored
bugfix: set default max_result_limit for search to 256*1024 (#6525) (#6645)
1 parent 65e691c commit b4a25e2

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## main / unreleased
2+
3+
* [CHANGE] Set default `max_result_limit` for search to 256*1024 [#6525](https://github.com/grafana/tempo/pull/6525) (@zhxiaogg)
4+
15
# v2.10.1
26

37
* [CHANGE] Upgrade Tempo to Go 1.25.7 [#6449](https://github.com/grafana/tempo/pull/6449) (@zalegrala)

docs/sources/tempo/configuration/manifest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ query_frontend:
394394
concurrent_jobs: 1000
395395
target_bytes_per_job: 104857600
396396
default_result_limit: 20
397-
max_result_limit: 0
397+
max_result_limit: 262144
398398
max_duration: 168h0m0s
399399
query_backend_after: 15m0s
400400
query_ingesters_until: 30m0s

modules/frontend/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ func (cfg *Config) RegisterFlagsAndApplyDefaults(string, *flag.FlagSet) {
9595
QueryBackendAfter: 15 * time.Minute,
9696
QueryIngestersUntil: 30 * time.Minute,
9797
DefaultLimit: 20,
98-
MaxLimit: 0,
98+
MaxLimit: 256 * 1024,
9999
MaxDuration: 168 * time.Hour, // 1 week
100100
ConcurrentRequests: defaultConcurrentRequests,
101101
TargetBytesPerRequest: defaultTargetBytesPerRequest,

modules/frontend/config_test.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package frontend
2+
3+
import (
4+
"flag"
5+
"testing"
6+
7+
"github.com/stretchr/testify/assert"
8+
)
9+
10+
func TestSearchSharderConfigDefaults(t *testing.T) {
11+
cfg := &Config{}
12+
cfg.RegisterFlagsAndApplyDefaults("", &flag.FlagSet{})
13+
14+
assert.Equal(t, uint32(256*1024), cfg.Search.Sharder.MaxLimit)
15+
}

0 commit comments

Comments
 (0)