Skip to content

Commit 96fb167

Browse files
committed
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
2 parents f1cf655 + d991ea6 commit 96fb167

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

Gemfile

+3
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ source 'https://rubygems.org'
1515
gem 'rails', gem_versions['rails']
1616
gem 'rails-deprecated_sanitizer', '~> 1.0.3'
1717

18+
# Improves copy-on-write performance for MRI
19+
gem 'nakayoshi_fork', '~> 0.0.4'
20+
1821
# Responders respond_to and respond_with
1922
gem 'responders', '~> 2.0'
2023

Gemfile.lock

+2
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ GEM
470470
mustermann-grape (1.0.0)
471471
mustermann (~> 1.0.0)
472472
mysql2 (0.4.10)
473+
nakayoshi_fork (0.0.4)
473474
net-ldap (0.16.0)
474475
net-ssh (5.0.1)
475476
netrc (0.11.0)
@@ -1051,6 +1052,7 @@ DEPENDENCIES
10511052
mini_magick
10521053
minitest (~> 5.7.0)
10531054
mysql2 (~> 0.4.10)
1055+
nakayoshi_fork (~> 0.0.4)
10541056
net-ldap
10551057
net-ssh (~> 5.0)
10561058
nokogiri (~> 1.8.2)

Gemfile.rails4.lock

+2
Original file line numberDiff line numberDiff line change
@@ -467,6 +467,7 @@ GEM
467467
mustermann-grape (1.0.0)
468468
mustermann (~> 1.0.0)
469469
mysql2 (0.4.10)
470+
nakayoshi_fork (0.0.4)
470471
net-ldap (0.16.0)
471472
net-ssh (5.0.1)
472473
netrc (0.11.0)
@@ -1042,6 +1043,7 @@ DEPENDENCIES
10421043
mini_magick
10431044
minitest (~> 5.7.0)
10441045
mysql2 (~> 0.4.10)
1046+
nakayoshi_fork (~> 0.0.4)
10451047
net-ldap
10461048
net-ssh (~> 5.0)
10471049
nokogiri (~> 1.8.2)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Improve memory performance by reducing dirty pages after fork()
3+
merge_request: 23169
4+
author:
5+
type: performance

0 commit comments

Comments
 (0)