diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-12-07 12:40:44 +0300 |
|---|---|---|
| committer | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2017-12-07 12:40:44 +0300 |
| commit | b89741eb88675f5f23fca7196772d6fdd2aac959 (patch) | |
| tree | 442a18ee15c2229ff4cb810f65d8332c13a0a13d | |
| parent | c1b609996670c805504e7eb36b98f2b9c605b060 (diff) | |
| parent | 2b0c1ef216e041f96f64f9951fe14eab4708c046 (diff) | |
Merge branch 'increase-connect-timeout' into 'master'
Increase default gitaly-ruby connection timeout to 40s
See merge request gitlab-org/gitaly!476
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | internal/rubyserver/rubyserver.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ce750868..56b685c98 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UNRELEASED +- Increase default gitaly-ruby connection timeout to 40s + https://gitlab.com/gitlab-org/gitaly/merge_requests/476 - Update vendored gitlab_git to f3a3bd50eafdcfcaeea21d6cfa0b8bbae7720fec https://gitlab.com/gitlab-org/gitaly/merge_requests/478 diff --git a/internal/rubyserver/rubyserver.go b/internal/rubyserver/rubyserver.go index 7e6bfdc9f..8753e213d 100644 --- a/internal/rubyserver/rubyserver.go +++ b/internal/rubyserver/rubyserver.go @@ -30,7 +30,7 @@ var ( lazyInit sync.Once // ConnectTimeout is the timeout for establishing a connection to the gitaly-ruby process. - ConnectTimeout = 20 * time.Second + ConnectTimeout = 40 * time.Second ) func init() { |