diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-19 08:33:54 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-19 08:33:54 +0000 |
| commit | 96fb16743debfe0bd1ea88248eef9ad13b605c4b (patch) | |
| tree | f687bade74b3dd027d981b277937481879e58356 | |
| parent | f1cf655021e784fdebd2da926040d1cf443d362a (diff) | |
| parent | d991ea6dddaa1ffaab5c9205bdfdc730c24b09b3 (diff) | |
| download | gitlab-ce-96fb16743debfe0bd1ea88248eef9ad13b605c4b.tar.gz | |
Merge branch 'sh-use-nakayoshi-fork' into 'master'
Improve memory performance by reducing dirty pages before fork
See merge request gitlab-org/gitlab-ce!23169
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 2 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-use-nakayoshi-fork.yml | 5 |
4 files changed, 12 insertions, 0 deletions
@@ -15,6 +15,9 @@ source 'https://rubygems.org' gem 'rails', gem_versions['rails'] gem 'rails-deprecated_sanitizer', '~> 1.0.3' +# Improves copy-on-write performance for MRI +gem 'nakayoshi_fork', '~> 0.0.4' + # Responders respond_to and respond_with gem 'responders', '~> 2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 4281870c711..77d0abd247e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -470,6 +470,7 @@ GEM mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) + nakayoshi_fork (0.0.4) net-ldap (0.16.0) net-ssh (5.0.1) netrc (0.11.0) @@ -1051,6 +1052,7 @@ DEPENDENCIES mini_magick minitest (~> 5.7.0) mysql2 (~> 0.4.10) + nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) nokogiri (~> 1.8.2) diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock index 428ffafce98..62f4f378245 100644 --- a/Gemfile.rails4.lock +++ b/Gemfile.rails4.lock @@ -467,6 +467,7 @@ GEM mustermann-grape (1.0.0) mustermann (~> 1.0.0) mysql2 (0.4.10) + nakayoshi_fork (0.0.4) net-ldap (0.16.0) net-ssh (5.0.1) netrc (0.11.0) @@ -1042,6 +1043,7 @@ DEPENDENCIES mini_magick minitest (~> 5.7.0) mysql2 (~> 0.4.10) + nakayoshi_fork (~> 0.0.4) net-ldap net-ssh (~> 5.0) nokogiri (~> 1.8.2) diff --git a/changelogs/unreleased/sh-use-nakayoshi-fork.yml b/changelogs/unreleased/sh-use-nakayoshi-fork.yml new file mode 100644 index 00000000000..5977d9b0974 --- /dev/null +++ b/changelogs/unreleased/sh-use-nakayoshi-fork.yml @@ -0,0 +1,5 @@ +--- +title: Improve memory performance by reducing dirty pages after fork() +merge_request: 23169 +author: +type: performance |