diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-04-15 15:34:54 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-04-15 15:34:54 +0000 |
| commit | 95bbcf082970ae72d3bac814101803e4118db47e (patch) | |
| tree | d75a2b20426d04211ec0adae40147e51e16828b0 | |
| parent | 6e3c9bee8bf09b2dd842e4e017e6f58c23dad32b (diff) | |
| parent | 75ec347d4499b98f27aa1f712258e7fac25fab15 (diff) | |
| download | gitlab-ce-95bbcf082970ae72d3bac814101803e4118db47e.tar.gz | |
Merge branch 'zj-fsck-no-timeout' into 'master'
Git FSCK has no timeout
Closes #53319
See merge request gitlab-org/gitlab-ce!27299
| -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 |