diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-26 00:07:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-26 00:07:30 +0300 |
| commit | 453fb3ab5c9b08fb04b9de8205e971e2769b9224 (patch) | |
| tree | 797a08adfef39a2e353349b14146aa12522eec23 /config | |
| parent | 99a6475e08172adc2c300273e81fccb04b0a8b0e (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers_before_autoloader/003_gc_compact.rb | 21 | ||||
| -rw-r--r-- | config/puma.example.development.rb | 7 | ||||
| -rw-r--r-- | config/puma.rb.example | 7 |
3 files changed, 0 insertions, 35 deletions
diff --git a/config/initializers_before_autoloader/003_gc_compact.rb b/config/initializers_before_autoloader/003_gc_compact.rb deleted file mode 100644 index 6b5d49d79ab..00000000000 --- a/config/initializers_before_autoloader/003_gc_compact.rb +++ /dev/null @@ -1,21 +0,0 @@ -# frozen_string_literal: true - -# Be sure to restart your server when you modify this file. -# -# Disables `GC.compact` method via monkey-patching. -# This is temporary measure to deal with reguarly appearing compacting issues (resulting in segfaults) in external gems. -# Having this patch allow using `nakayoshi_fork` in `config/puma.rb`, -# only without `GC.compact` (still invoking 4 GC cycles). -# Refer to for details: https://github.com/puma/puma/blob/80274413b04fae77cac7a7fecab7d6e89204343b/lib/puma/util.rb#L27 - -# rubocop:disable Rails/Output -module NakayoshiForkCompacting - module MonkeyPatch - def compact - puts 'Note: GC compacting is currently disabled.'\ - ' Refer to `config/initializers_before_autoloader/003_gc_compact.rb` for details.' - end - end -end - -GC.singleton_class.prepend NakayoshiForkCompacting::MonkeyPatch diff --git a/config/puma.example.development.rb b/config/puma.example.development.rb index 1183e3d75cf..e7dacc70c2e 100644 --- a/config/puma.example.development.rb +++ b/config/puma.example.development.rb @@ -84,13 +84,6 @@ worker_timeout 60 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f -# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258 -# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork -if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 && - ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true' - nakayoshi_fork -end - # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" diff --git a/config/puma.rb.example b/config/puma.rb.example index ac3adc1eeec..07a6f6a2501 100644 --- a/config/puma.rb.example +++ b/config/puma.rb.example @@ -73,13 +73,6 @@ worker_timeout 60 # https://github.com/puma/puma/blob/master/5.0-Upgrade.md#lower-latency-better-throughput wait_for_less_busy_worker ENV.fetch('PUMA_WAIT_FOR_LESS_BUSY_WORKER', 0.001).to_f -# nakayoshi_fork was removed in Puma 6.0: https://github.com/puma/puma/issues/2258 -# https://github.com/puma/puma/blob/master/5.0-Upgrade.md#nakayoshi_fork -if Gem::Version.new(Puma::Const::PUMA_VERSION).canonical_segments.first == 5 && - ENV['DISABLE_PUMA_NAKAYOSHI_FORK'] != 'true' - nakayoshi_fork -end - # Use json formatter require_relative "/home/git/gitlab/lib/gitlab/puma_logging/json_formatter" |