diff options
| author | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-04-12 07:55:22 +0000 |
|---|---|---|
| committer | Zeger-Jan van de Weg <git@zjvandeweg.nl> | 2019-04-15 10:17:56 +0200 |
| commit | 75ec347d4499b98f27aa1f712258e7fac25fab15 (patch) | |
| tree | 2d410ee3458497ebe1898615944927190f430b1a | |
| parent | 0a99e0220d9371423039f05f700af3675b26624f (diff) | |
| download | gitlab-ce-zj-fsck-no-timeout.tar.gz | |
Git FSCK has no timeoutzj-fsck-no-timeout
FSCK is usually called through sidekiq, but a rake task doesn't have a
mechanism to default to no timeout for this RPC.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53319
| -rw-r--r-- | changelogs/unreleased/zj-fsck-no-timeout.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/zj-fsck-no-timeout.yml b/changelogs/unreleased/zj-fsck-no-timeout.yml new file mode 100644 index 00000000000..044f269bb4d --- /dev/null +++ b/changelogs/unreleased/zj-fsck-no-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Remove deadline for Git fsck +merge_request: 27299 +author: +type: fixed diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index a08bfd0e25b..74aae4a8e97 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -190,7 +190,7 @@ module Gitlab def fsck request = Gitaly::FsckRequest.new(repository: @gitaly_repo) - response = GitalyClient.call(@storage, :repository_service, :fsck, request) + response = GitalyClient.call(@storage, :repository_service, :fsck, request, timeout: GitalyClient.no_timeout) if response.error.empty? return "", 0 |