Commit 6f99f82d authored by Sean McGivern's avatar Sean McGivern

Merge branch '2911-shuffle-es-urls' into 'master'

Spread load across all nodes in an elasticsearch cluster

Closes #2911

See merge request !2625
parents 3896e942 6cf644f6
---
title: Spread load across all nodes in an elasticsearch cluster
merge_request: 2625
author:
......@@ -10,7 +10,11 @@ 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], retry_on_failure: true }
base_config = {
urls: config[:url],
randomize_hosts: true,
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