diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-08-02 09:23:39 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2018-08-02 09:28:17 +0300 |
| commit | c7bf366063dc36b5b23e9624d672963b52836613 (patch) | |
| tree | 1d6006cf655abaa363c2087d08af4d840aac4ad6 /lib | |
| parent | 9812e5dd7c52e67b22781a440ee04dbb2a086000 (diff) | |
Set default timeout for deleting many refs
Prior to this change, this RPC had a fast_timeout. This timeout doesn't
set no timeout on Sidekiq. Deleting many refs can take over a couple of
seconds, so a default timeout would be neccesairy.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/49862
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/gitaly_client/ref_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client/ref_service.rb b/lib/gitlab/gitaly_client/ref_service.rb index fbe7d4ba1ae..41d58192818 100644 --- a/lib/gitlab/gitaly_client/ref_service.rb +++ b/lib/gitlab/gitaly_client/ref_service.rb @@ -166,7 +166,7 @@ module Gitlab except_with_prefix: except_with_prefixes.map { |r| encode_binary(r) } ) - response = GitalyClient.call(@repository.storage, :ref_service, :delete_refs, request, timeout: GitalyClient.fast_timeout) + response = GitalyClient.call(@repository.storage, :ref_service, :delete_refs, request, timeout: GitalyClient.default_timeout) raise Gitlab::Git::Repository::GitError, response.git_error if response.git_error.present? end |