Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2383dfcd
Commit
2383dfcd
authored
Jun 20, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retry Elasticsearch queries on failure
parent
786edf41
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
changelogs/unreleased-ee/2681-elasticsearch-retry.yml
changelogs/unreleased-ee/2681-elasticsearch-retry.yml
+4
-0
lib/gitlab/elastic/client.rb
lib/gitlab/elastic/client.rb
+1
-1
No files found.
changelogs/unreleased-ee/2681-elasticsearch-retry.yml
0 → 100644
View file @
2383dfcd
---
title
:
Retry Elasticsearch queries on failure
merge_request
:
2181
author
:
lib/gitlab/elastic/client.rb
View file @
2383dfcd
...
@@ -10,7 +10,7 @@ module Gitlab
...
@@ -10,7 +10,7 @@ module Gitlab
# Takes a hash as returned by `ApplicationSetting#elasticsearch_config`,
# Takes a hash as returned by `ApplicationSetting#elasticsearch_config`,
# and configures itself based on those parameters
# and configures itself based on those parameters
def
self
.
build
(
config
)
def
self
.
build
(
config
)
base_config
=
{
urls:
config
[
:url
]
}
base_config
=
{
urls:
config
[
:url
]
,
retry_on_failure:
true
}
if
config
[
:aws
]
if
config
[
:aws
]
creds
=
resolve_aws_credentials
(
config
)
creds
=
resolve_aws_credentials
(
config
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment