Commit 7b4b22a8 authored by Sean McGivern's avatar Sean McGivern

Merge branch '2681-elasticsearch-retry' into 'master'

Elasticsearch queries should retry on failure

Closes #2681

See merge request !2181
parents fd20aa68 2383dfcd
---
title: Retry Elasticsearch queries on failure
merge_request: 2181
author:
......@@ -10,7 +10,7 @@ module Gitlab
# Takes a hash as returned by `ApplicationSetting#elasticsearch_config`,
# and configures itself based on those parameters
def self.build(config)
base_config = { urls: config[:url] }
base_config = { urls: config[:url], retry_on_failure: true }
if config[:aws]
creds = resolve_aws_credentials(config)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment