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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
7ee5b1f6
Commit
7ee5b1f6
authored
Jul 11, 2018
by
Andrew Newdigate
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add a fast_timeout for the `ServerService.ServerInfo` endpoint
parent
67708aa5
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/gitaly-serverservice-info-timeout.yml
changelogs/unreleased/gitaly-serverservice-info-timeout.yml
+5
-0
lib/gitaly/server.rb
lib/gitaly/server.rb
+1
-1
lib/gitlab/gitaly_client/server_service.rb
lib/gitlab/gitaly_client/server_service.rb
+1
-1
No files found.
changelogs/unreleased/gitaly-serverservice-info-timeout.yml
0 → 100644
View file @
7ee5b1f6
---
title
:
Use appropriate timeout on Gitaly server info checks, avoid error on timeout
merge_request
:
20552
author
:
type
:
fixed
lib/gitaly/server.rb
View file @
7ee5b1f6
...
@@ -50,7 +50,7 @@ module Gitaly
...
@@ -50,7 +50,7 @@ module Gitaly
@info
||=
@info
||=
begin
begin
Gitlab
::
GitalyClient
::
ServerService
.
new
(
@storage
).
info
Gitlab
::
GitalyClient
::
ServerService
.
new
(
@storage
).
info
rescue
GRPC
::
Unavailable
,
GRPC
::
GRPC
::
DeadlineExceeded
rescue
GRPC
::
Unavailable
,
GRPC
::
DeadlineExceeded
# This will show the server as being out of date
# This will show the server as being out of date
Gitaly
::
ServerInfoResponse
.
new
(
git_version:
''
,
server_version:
''
,
storage_statuses:
[])
Gitaly
::
ServerInfoResponse
.
new
(
git_version:
''
,
server_version:
''
,
storage_statuses:
[])
end
end
...
...
lib/gitlab/gitaly_client/server_service.rb
View file @
7ee5b1f6
...
@@ -9,7 +9,7 @@ module Gitlab
...
@@ -9,7 +9,7 @@ module Gitlab
end
end
def
info
def
info
GitalyClient
.
call
(
@storage
,
:server_service
,
:server_info
,
Gitaly
::
ServerInfoRequest
.
new
)
GitalyClient
.
call
(
@storage
,
:server_service
,
:server_info
,
Gitaly
::
ServerInfoRequest
.
new
,
timeout:
GitalyClient
.
fast_timeout
)
end
end
end
end
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