diff options
| author | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-07-24 19:40:55 +0300 |
|---|---|---|
| committer | Alejandro Rodríguez <alejorro70@gmail.com> | 2018-07-24 19:40:55 +0300 |
| commit | 3a9ae120cb3e6572a44e0b6b0519b3b451a18912 (patch) | |
| tree | 524938da4bbfdeaf4633131711118946623573d5 | |
| parent | 1796b4a885189da2cc9d70c582ba4713690f04d0 (diff) | |
| parent | c73ea18b28ca7828ac2fb6b501d399a791349f65 (diff) | |
Merge branch 'gitaly-ruby-memory-limit' into 'master'
Lower gitaly-ruby default max_rss to 200MB
See merge request gitlab-org/gitaly!833
| -rw-r--r-- | changelogs/unreleased/gitaly-ruby-memory-limit.yml | 5 | ||||
| -rw-r--r-- | config.toml.example | 2 | ||||
| -rw-r--r-- | internal/config/ruby.go | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/gitaly-ruby-memory-limit.yml b/changelogs/unreleased/gitaly-ruby-memory-limit.yml new file mode 100644 index 000000000..dd7531bbe --- /dev/null +++ b/changelogs/unreleased/gitaly-ruby-memory-limit.yml @@ -0,0 +1,5 @@ +--- +title: Lower gitaly-ruby default max_rss to 200MB +merge_request: 833 +author: +type: other diff --git a/config.toml.example b/config.toml.example index 76e0ea047..5a80cbbf4 100644 --- a/config.toml.example +++ b/config.toml.example @@ -49,7 +49,7 @@ path = "/home/git/repositories" dir = "/home/git/gitaly/ruby" # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) -# max_rss = 300000000 +# max_rss = 200000000 # # # Grace period before a gitaly-ruby process is forcibly terminated after exceeding max_rss (seconds) # graceful_restart_timeout = "10m" diff --git a/internal/config/ruby.go b/internal/config/ruby.go index 9ec0fd3b0..7e73ec0b2 100644 --- a/internal/config/ruby.go +++ b/internal/config/ruby.go @@ -36,7 +36,7 @@ func ConfigureRuby() error { } if Config.Ruby.MaxRSS == 0 { - Config.Ruby.MaxRSS = 300 * 1024 * 1024 + Config.Ruby.MaxRSS = 200 * 1024 * 1024 } Config.Ruby.RestartDelay = Config.Ruby.RestartDelayToml.Duration |