diff --git a/CHANGELOG.md b/CHANGELOG.md index 92c2eadeaeedb..c1ceafd50588b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ All notable changes to Sourcegraph are documented in this file. - A regression in repo-updater was fixed that lead to every repository's git clone being updated every time the list of repositories was synced from the code host. [#8501](https://github.com/sourcegraph/sourcegraph/issues/8501) - The default timeout of indexed search has been increased. Previously indexed search would always return within 3s. This lead to broken behaviour on new instances which had yet to tune resource allocations. [#8720](https://github.com/sourcegraph/sourcegraph/pull/8720) - Bitbucket Server older than 5.13 failed to sync since Sourcegraph 3.12. This was due to us querying for the `archived` label, but Bitbucket Server 5.13 does not support labels. [#8883](https://github.com/sourcegraph/sourcegraph/issues/8883) +- The default timeout of indexed search has been increased. Previously indexed search would always return within 3s. This lead to broken behaviour on new instances which had yet to tune resource allocations. [#8720](https://github.com/sourcegraph/sourcegraph/pull/8720) ### Removed diff --git a/cmd/frontend/graphqlbackend/textsearch_test.go b/cmd/frontend/graphqlbackend/textsearch_test.go index 4b5c49af43494..fc72a95389f2c 100644 --- a/cmd/frontend/graphqlbackend/textsearch_test.go +++ b/cmd/frontend/graphqlbackend/textsearch_test.go @@ -567,7 +567,7 @@ func Test_zoektSearchHEAD(t *testing.T) { repos: singleRepositoryRevisions, useFullDeadline: false, searcher: &fakeSearcher{result: &zoekt.SearchResult{}}, - since: func(time.Time) time.Duration { return 4 * time.Second }, + since: func(time.Time) time.Duration { return 15 * time.Second }, }, wantFm: nil, wantLimitHit: false, diff --git a/cmd/frontend/graphqlbackend/zoekt.go b/cmd/frontend/graphqlbackend/zoekt.go index a6578760ca881..a7df7306c1e46 100644 --- a/cmd/frontend/graphqlbackend/zoekt.go +++ b/cmd/frontend/graphqlbackend/zoekt.go @@ -47,7 +47,7 @@ func zoektResultCountFactor(numRepos int, query *search.TextPatternInfo) int { func zoektSearchOpts(k int, query *search.TextPatternInfo) zoekt.SearchOptions { searchOpts := zoekt.SearchOptions{ - MaxWallTime: 3 * time.Second, + MaxWallTime: 10 * time.Second, ShardMaxMatchCount: 100 * k, TotalMaxMatchCount: 100 * k, ShardMaxImportantMatch: 15 * k,