kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Zeger-Jan van de Weg 2018-08-02 08:23:39 +02:00
parent 9812e5dd7c
commit c7bf366063
No known key found for this signature in database
GPG Key ID: 65F6A8D64A88ABAC
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/gitaly_client/ref_service.rb
View File

@ -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