Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e77f46d1
Commit
e77f46d1
authored
Jul 24, 2018
by
Zeger-Jan van de Weg
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove timeouts for long running requests
parent
1c24eafb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
changelogs/unreleased/zj-backup-timeout.yml
changelogs/unreleased/zj-backup-timeout.yml
+5
-0
lib/gitlab/gitaly_client.rb
lib/gitlab/gitaly_client.rb
+5
-1
lib/gitlab/gitaly_client/repository_service.rb
lib/gitlab/gitaly_client/repository_service.rb
+3
-3
No files found.
changelogs/unreleased/zj-backup-timeout.yml
0 → 100644
View file @
e77f46d1
---
title
:
Disable Gitaly timeouts when creating or restoring backups
merge_request
:
20810
author
:
type
:
fixed
lib/gitlab/gitaly_client.rb
View file @
e77f46d1
...
@@ -407,7 +407,7 @@ module Gitlab
...
@@ -407,7 +407,7 @@ module Gitlab
# The default timeout on all Gitaly calls
# The default timeout on all Gitaly calls
def
self
.
default_timeout
def
self
.
default_timeout
return
0
if
Sidekiq
.
server?
return
no_timeout
if
Sidekiq
.
server?
timeout
(
:gitaly_timeout_default
)
timeout
(
:gitaly_timeout_default
)
end
end
...
@@ -420,6 +420,10 @@ module Gitlab
...
@@ -420,6 +420,10 @@ module Gitlab
timeout
(
:gitaly_timeout_medium
)
timeout
(
:gitaly_timeout_medium
)
end
end
def
self
.
no_timeout
0
end
def
self
.
timeout
(
timeout_name
)
def
self
.
timeout
(
timeout_name
)
Gitlab
::
CurrentSettings
.
current_application_settings
[
timeout_name
]
Gitlab
::
CurrentSettings
.
current_application_settings
[
timeout_name
]
end
end
...
...
lib/gitlab/gitaly_client/repository_service.rb
View file @
e77f46d1
...
@@ -202,7 +202,7 @@ module Gitlab
...
@@ -202,7 +202,7 @@ module Gitlab
save_path
,
save_path
,
:create_bundle
,
:create_bundle
,
Gitaly
::
CreateBundleRequest
,
Gitaly
::
CreateBundleRequest
,
GitalyClient
.
default
_timeout
GitalyClient
.
no
_timeout
)
)
end
end
...
@@ -220,7 +220,7 @@ module Gitlab
...
@@ -220,7 +220,7 @@ module Gitlab
bundle_path
,
bundle_path
,
:create_repository_from_bundle
,
:create_repository_from_bundle
,
Gitaly
::
CreateRepositoryFromBundleRequest
,
Gitaly
::
CreateRepositoryFromBundleRequest
,
GitalyClient
.
default
_timeout
GitalyClient
.
no
_timeout
)
)
end
end
...
@@ -245,7 +245,7 @@ module Gitlab
...
@@ -245,7 +245,7 @@ module Gitlab
:repository_service
,
:repository_service
,
:create_repository_from_snapshot
,
:create_repository_from_snapshot
,
request
,
request
,
timeout:
GitalyClient
.
default
_timeout
timeout:
GitalyClient
.
no
_timeout
)
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment