Commit 9f7e8999 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch 'enable-jemalloc-by-default'

parents e31fb201 60a6a643
......@@ -10,6 +10,7 @@ omnibus-gitlab repository.
- Support specifying a post reconfigure script to run in the docker container
- Updated cacerts.pem to 2016-09-14 version
- Add support for nginx status
- Enable jemalloc by default 0a7799d2
8.12.4
......
......@@ -67,7 +67,7 @@ default['gitlab']['gitlab-rails']['env'] = {
'ICU_DATA' => "#{node['package']['install-dir']}/embedded/share/icu/current",
'PYTHONPATH' => "#{node['package']['install-dir']}/embedded/lib/python3.4/site-packages"
}
default['gitlab']['gitlab-rails']['enable_jemalloc'] = false
default['gitlab']['gitlab-rails']['enable_jemalloc'] = true
default['gitlab']['gitlab-rails']['internal_api_url'] = nil
default['gitlab']['gitlab-rails']['uploads_directory'] = "/var/opt/gitlab/gitlab-rails/uploads"
......
......@@ -163,7 +163,7 @@ describe 'gitlab::gitlab-rails' do
it_behaves_like "enabled gitlab-rails env", "ICU_DATA", '\/opt\/gitlab\/embedded\/share\/icu\/current'
it_behaves_like "enabled gitlab-rails env", "PYTHONPATH", '\/opt\/gitlab\/embedded\/lib\/python3.4\/site-packages'
it_behaves_like "disabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
it_behaves_like "enabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
context 'when a custom env variable is specified' do
before do
......@@ -173,16 +173,16 @@ describe 'gitlab::gitlab-rails' do
it_behaves_like "enabled gitlab-rails env", "IAM", 'CUSTOMVAR'
it_behaves_like "enabled gitlab-rails env", "ICU_DATA", '\/opt\/gitlab\/embedded\/share\/icu\/current'
it_behaves_like "disabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
it_behaves_like "enabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
end
end
context 'when jemalloc is enabled' do
context 'when jemalloc is disabled' do
before do
stub_gitlab_rb(gitlab_rails: { enable_jemalloc: true })
stub_gitlab_rb(gitlab_rails: { enable_jemalloc: false })
end
it_behaves_like "enabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
it_behaves_like "disabled gitlab-rails env", "LD_PRELOAD", '\/opt\/gitlab\/embedded\/lib\/libjemalloc.so'
end
end
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment