diff options
author | Rémy Coutable <remy@rymai.me> | 2018-07-24 13:15:25 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-07-24 13:15:25 +0000 |
commit | e659b398f31705673f4be6f43cb4587bb73f98ef (patch) | |
tree | 7746d3a82a49cbd1b8bcb84438830541d2f7770f | |
parent | a90a080aef481828a923f76a99036276032406d8 (diff) | |
parent | e77f46d1296de6720a44a12c68632efcf5e65a9a (diff) | |
download | gitlab-ce-e659b398f31705673f4be6f43cb4587bb73f98ef.tar.gz |
Merge branch 'zj-backup-timeout' into 'master'
Remove timeouts for long running requests
See merge request gitlab-org/gitlab-ce!20810
-rw-r--r-- | changelogs/unreleased/zj-backup-timeout.yml | 5 | ||||
-rw-r--r-- | lib/gitlab/gitaly_client.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/gitaly_client/repository_service.rb | 6 |
3 files changed, 13 insertions, 4 deletions
diff --git a/changelogs/unreleased/zj-backup-timeout.yml b/changelogs/unreleased/zj-backup-timeout.yml new file mode 100644 index 00000000000..b2ad2ed8c63 --- /dev/null +++ b/changelogs/unreleased/zj-backup-timeout.yml @@ -0,0 +1,5 @@ +--- +title: Disable Gitaly timeouts when creating or restoring backups +merge_request: 20810 +author: +type: fixed diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index 58a4060cc96..c27972a84a4 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -407,7 +407,7 @@ module Gitlab # The default timeout on all Gitaly calls def self.default_timeout - return 0 if Sidekiq.server? + return no_timeout if Sidekiq.server? timeout(:gitaly_timeout_default) end @@ -420,6 +420,10 @@ module Gitlab timeout(:gitaly_timeout_medium) end + def self.no_timeout + 0 + end + def self.timeout(timeout_name) Gitlab::CurrentSettings.current_application_settings[timeout_name] end diff --git a/lib/gitlab/gitaly_client/repository_service.rb b/lib/gitlab/gitaly_client/repository_service.rb index 64b9af4d70c..2956ed4b911 100644 --- a/lib/gitlab/gitaly_client/repository_service.rb +++ b/lib/gitlab/gitaly_client/repository_service.rb @@ -202,7 +202,7 @@ module Gitlab save_path, :create_bundle, Gitaly::CreateBundleRequest, - GitalyClient.default_timeout + GitalyClient.no_timeout ) end @@ -220,7 +220,7 @@ module Gitlab bundle_path, :create_repository_from_bundle, Gitaly::CreateRepositoryFromBundleRequest, - GitalyClient.default_timeout + GitalyClient.no_timeout ) end @@ -245,7 +245,7 @@ module Gitlab :repository_service, :create_repository_from_snapshot, request, - timeout: GitalyClient.default_timeout + timeout: GitalyClient.no_timeout ) end |