Commit 96fb1674 authored by Sean McGivern's avatar Sean McGivern

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
parents f1cf6550 d991ea6d
...@@ -15,6 +15,9 @@ source 'https://rubygems.org' ...@@ -15,6 +15,9 @@ source 'https://rubygems.org'
gem 'rails', gem_versions['rails'] gem 'rails', gem_versions['rails']
gem 'rails-deprecated_sanitizer', '~> 1.0.3' 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 # Responders respond_to and respond_with
gem 'responders', '~> 2.0' gem 'responders', '~> 2.0'
......
...@@ -470,6 +470,7 @@ GEM ...@@ -470,6 +470,7 @@ GEM
mustermann-grape (1.0.0) mustermann-grape (1.0.0)
mustermann (~> 1.0.0) mustermann (~> 1.0.0)
mysql2 (0.4.10) mysql2 (0.4.10)
nakayoshi_fork (0.0.4)
net-ldap (0.16.0) net-ldap (0.16.0)
net-ssh (5.0.1) net-ssh (5.0.1)
netrc (0.11.0) netrc (0.11.0)
...@@ -1051,6 +1052,7 @@ DEPENDENCIES ...@@ -1051,6 +1052,7 @@ DEPENDENCIES
mini_magick mini_magick
minitest (~> 5.7.0) minitest (~> 5.7.0)
mysql2 (~> 0.4.10) mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4)
net-ldap net-ldap
net-ssh (~> 5.0) net-ssh (~> 5.0)
nokogiri (~> 1.8.2) nokogiri (~> 1.8.2)
......
...@@ -467,6 +467,7 @@ GEM ...@@ -467,6 +467,7 @@ GEM
mustermann-grape (1.0.0) mustermann-grape (1.0.0)
mustermann (~> 1.0.0) mustermann (~> 1.0.0)
mysql2 (0.4.10) mysql2 (0.4.10)
nakayoshi_fork (0.0.4)
net-ldap (0.16.0) net-ldap (0.16.0)
net-ssh (5.0.1) net-ssh (5.0.1)
netrc (0.11.0) netrc (0.11.0)
...@@ -1042,6 +1043,7 @@ DEPENDENCIES ...@@ -1042,6 +1043,7 @@ DEPENDENCIES
mini_magick mini_magick
minitest (~> 5.7.0) minitest (~> 5.7.0)
mysql2 (~> 0.4.10) mysql2 (~> 0.4.10)
nakayoshi_fork (~> 0.0.4)
net-ldap net-ldap
net-ssh (~> 5.0) net-ssh (~> 5.0)
nokogiri (~> 1.8.2) nokogiri (~> 1.8.2)
......
---
title: Improve memory performance by reducing dirty pages after fork()
merge_request: 23169
author:
type: performance
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