diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 15:08:08 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 15:08:08 +0000 |
| commit | 946771d0b016ae92b15a60bc3290a33b94191ffe (patch) | |
| tree | 64862c2433989483f5fce45d5539242577a362eb /doc/user/admin_area | |
| parent | f1e2fca19a90a6992c2020cf8c2159cfb0b61bca (diff) | |
| download | gitlab-ce-946771d0b016ae92b15a60bc3290a33b94191ffe.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area')
| -rw-r--r-- | doc/user/admin_area/settings/gitaly_timeouts.md | 34 | ||||
| -rw-r--r-- | doc/user/admin_area/settings/img/gitaly_timeouts.png | bin | 0 -> 68410 bytes | |||
| -rw-r--r-- | doc/user/admin_area/settings/index.md | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/doc/user/admin_area/settings/gitaly_timeouts.md b/doc/user/admin_area/settings/gitaly_timeouts.md new file mode 100644 index 00000000000..775a99d7574 --- /dev/null +++ b/doc/user/admin_area/settings/gitaly_timeouts.md @@ -0,0 +1,34 @@ +--- +type: reference +--- + +# Gitaly timeouts + + + +3 timeout types can be configured to make sure that long running +Gitaly calls don't needlessly take up resources. + +- Default timeout + +This timeout is the default for most Gitaly calls. +It should be shorter than the worker timeout that can be configured +for +[Puma](https://docs.gitlab.com/omnibus/settings/puma.html#puma-settings) +or [Unicorn](https://docs.gitlab.com/omnibus/settings/unicorn.html). +This makes sure that Gitaly calls made within a web request cannot +exceed these the entire request timeout. + +The default for this timeout is 55 seconds. + +- Fast timeout + +This is the timeout for very short Gitaly calls. + +The default for this timeout is 10 seconds. + +- Medium timeout + +This timeout should be between the default and the fast timeout + +The default for this timeout is 30 seconds. diff --git a/doc/user/admin_area/settings/img/gitaly_timeouts.png b/doc/user/admin_area/settings/img/gitaly_timeouts.png Binary files differnew file mode 100644 index 00000000000..82b2889b0d5 --- /dev/null +++ b/doc/user/admin_area/settings/img/gitaly_timeouts.png diff --git a/doc/user/admin_area/settings/index.md b/doc/user/admin_area/settings/index.md index 07d614b449b..103a3f7230d 100644 --- a/doc/user/admin_area/settings/index.md +++ b/doc/user/admin_area/settings/index.md @@ -24,6 +24,7 @@ include: - [Protected paths](protected_paths.md) **(CORE ONLY)** - [Help messages for the `/help` page and the login page](help_page.md) - [Push event activities limit and bulk push events](push_event_activities_limit.md) +- [Gitaly timeouts](gitaly_timeouts.md) NOTE: **Note:** You can change the [first day of the week](../../profile/preferences.md) for the entire GitLab instance |
