Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-08-28 05:16:40 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Add Elasticsearch request timeout of 10s (can be overridden through ES_QUERY_TIMEOUT) (#40064)

Browse Source
This commit is contained in:
Claire
2026-08-05 16:42:53 +02:00
committed by GitHub
parent f49e4f7aa9
commit 299b628c3b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/account_search_service.rb
View File

@@ -10,6 +10,8 @@ class AccountSearchService < BaseService
# Min. number of characters to look for non-exact matches
MIN_QUERY_LENGTH = 3
ES_QUERY_TIMEOUT = ENV.fetch('ES_QUERY_TIMEOUT', '10s')
class QueryBuilder
def initialize(query, account, options = {})
@query = query
@@ -253,7 +255,7 @@ class AccountSearchService < BaseService
end
end
records = elastic_stoplight_wrapper.run { query_builder.build.limit(limit_for_non_exact_results).offset(offset).objects.compact }
records = elastic_stoplight_wrapper.run { query_builder.build.limit(limit_for_non_exact_results).timeout(ES_QUERY_TIMEOUT).offset(offset).objects.compact }
ActiveRecord::Associations::Preloader.new(records: records, associations: [:account_stat, { user: :role }]).call

4
app/services/statuses_search_service.rb
View File

@@ -3,6 +3,8 @@
class StatusesSearchService < BaseService
include SearchStoplight
ES_QUERY_TIMEOUT = ENV.fetch('ES_QUERY_TIMEOUT', '10s')
def call(query, account = nil, options = {})
MastodonOTELTracer.in_span('StatusesSearchService#call') do |span|
@query = query&.strip
@@ -28,7 +30,7 @@ class StatusesSearchService < BaseService
def status_search_results
request = parsed_query.request
results = elastic_stoplight_wrapper.run { request.collapse(field: :id).order(id: { order: :desc }).limit(@limit).offset(@offset).objects.compact }
results = elastic_stoplight_wrapper.run { request.timeout(ES_QUERY_TIMEOUT).collapse(field: :id).order(id: { order: :desc }).limit(@limit).offset(@offset).objects.compact }
account_ids = results.map(&:account_id)
account_domains = results.map(&:account_domain)