diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 06:07:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-25 06:07:58 +0000 |
| commit | 9c83aadd2604e7e6cb1f84683f951e6b12872618 (patch) | |
| tree | c0a14c87378e832e87580be382e1c8ccea188b71 /doc/administration/troubleshooting/postgresql.md | |
| parent | 23bc19cb73aad969c9636b8b935111645e809e54 (diff) | |
| download | gitlab-ce-9c83aadd2604e7e6cb1f84683f951e6b12872618.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/troubleshooting/postgresql.md')
| -rw-r--r-- | doc/administration/troubleshooting/postgresql.md | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/administration/troubleshooting/postgresql.md b/doc/administration/troubleshooting/postgresql.md index b793f0a2ebc..966db356849 100644 --- a/doc/administration/troubleshooting/postgresql.md +++ b/doc/administration/troubleshooting/postgresql.md @@ -121,8 +121,8 @@ In this case, the guidance we had from development was to drop deadlock_timeout PostgresSQL defaults: -- statement_timeout = 0 (never) -- idle_in_transaction_session_timeout = 0 (never) +- `statement_timeout = 0` (never) +- `idle_in_transaction_session_timeout = 0` (never) Comments in issue [#1](https://gitlab.com/gitlab-org/gitlab/issues/30528) indicate that these should both be set to at least a number of minutes for all Omnibus installations (so they don't hang indefinitely). However, 15s for statement_timeout is very short, and will only be effective if the underlying infrastructure is very performant. @@ -136,7 +136,7 @@ puts c.execute('SHOW idle_in_transaction_session_timeout').to_a ;" It may take a little while to respond. -``` +```ruby {"statement_timeout"=>"1min"} {"lock_timeout"=>"0"} {"idle_in_transaction_session_timeout"=>"1min"} |