From c7bf366063dc36b5b23e9624d672963b52836613 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 2 Aug 2018 08:23:39 +0200 Subject: 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 --- lib/gitlab/gitaly_client/ref_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') 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 -- cgit v1.2.3