gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'enable_sidekiq_memory_killer' into 'master' 

Enable Sidekiq MemoryKiller by default

We have been using the Sidekiq MemoryKiller on gitlab.com since
2014-12-08, and the specific limit value of 1,000,000 since 2014-12-11.
Sidekiq memory behavior is acceptable now so I think we should ship
7.6 with the MemoryKiller enabled.

See merge request !267
This commit is contained in:
Marin Jankovski 2014-12-17 15:57:29 +00:00
parent 2c7e10d23f 887f32a040
commit 99bbe20b8f
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ omnibus-gitlab repository.
- Update libgit2 and rugged to version 0.21.2 66ac2e805a166ecb10bdf8ba001b106acd7e49f3
- Generate SMTP settings using one template for both applications (Michael Ruoss) a6d6ff11f102c6fa9da6209f80162c5e137feeb9
- Add gitlab-shell configuration settings for http_settings, audit_usernames, log_level 5e4310442a608c5c420ffe670a9ab6f111489151
- Enable Sidekiq MemoryKiller by default with a 1,000,000 kB limit
7.5.0

1
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -45,6 +45,7 @@ default['gitlab']['gitlab-rails']['dir'] = "/var/opt/gitlab/gitlab-rails"
default['gitlab']['gitlab-rails']['log_directory'] = "/var/log/gitlab/gitlab-rails"
default['gitlab']['gitlab-rails']['environment'] = 'production'
default['gitlab']['gitlab-rails']['env'] = {
'SIDEKIQ_MEMORY_KILLER_MAX_RSS' => '1000000',
'BUNDLE_GEMFILE' => "/opt/gitlab/embedded/service/gitlab-rails/Gemfile",
'PATH' => "/opt/gitlab/bin:/opt/gitlab/embedded/bin:/bin:/usr/bin"
}