diff options
| author | Mark Chao <mchao@gitlab.com> | 2019-03-15 17:05:37 +0800 |
|---|---|---|
| committer | Mark Chao <mchao@gitlab.com> | 2019-03-15 17:15:07 +0800 |
| commit | 697cb6f627ed4900c59d008d34f6399c18f33bfc (patch) | |
| tree | 7a0f5ed1425cfd2bfdd02723a42bf4cefc5dc537 | |
| parent | 8a59c9fdba4572cdfd60be6630d96fd37dc35654 (diff) | |
| download | gitlab-ce-697cb6f627ed4900c59d008d34f6399c18f33bfc.tar.gz | |
Remove timeout for GitalyClient remove_remote
This can be slow because it must potentially remove a lot of remote
refs (if the remote being removed has a lot of refs)
| -rw-r--r-- | changelogs/unreleased/56015-remove-remote-timeout.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/remote_service.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/56015-remove-remote-timeout.yml b/changelogs/unreleased/56015-remove-remote-timeout.yml new file mode 100644 index 00000000000..9b40ada5291 --- /dev/null +++ b/changelogs/unreleased/56015-remove-remote-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Fix removing remote mirror failure which leaves unnecessary refs behind +merge_request: 26213 +author: +type: fixed diff --git a/lib/gitlab/gitaly_client/remote_service.rb b/lib/gitlab/gitaly_client/remote_service.rb index 81fac37ee68..f3589fea39f 100644 --- a/lib/gitlab/gitaly_client/remote_service.rb +++ b/lib/gitlab/gitaly_client/remote_service.rb @@ -38,7 +38,7 @@ module Gitlab def remove_remote(name) request = Gitaly::RemoveRemoteRequest.new(repository: @gitaly_repo, name: name) - response = GitalyClient.call(@storage, :remote_service, :remove_remote, request, timeout: GitalyClient.fast_timeout) + response = GitalyClient.call(@storage, :remote_service, :remove_remote, request) response.result end |