Add latest changes from gitlab-org/gitlab@master

2 files changed, 9 insertions, 17 deletions

diff --git a/lib/gitlab/cluster/lifecycle_events.rb b/lib/gitlab/cluster/lifecycle_events.rb
index b3dc59466ec..6b7b9b09269 100644
--- a/lib/gitlab/cluster/lifecycle_events.rb
+++ b/lib/gitlab/cluster/lifecycle_events.rb
@@ -8,13 +8,13 @@ module Gitlab
     # LifecycleEvents lets Rails initializers register application startup hooks
     # that are sensitive to forking. For example, to defer the creation of
     # watchdog threads. This lets us abstract away the Unix process
-    # lifecycles of Unicorn, Sidekiq, Puma, Puma Cluster, etc.
+    # lifecycles of Sidekiq, Puma, Puma Cluster, etc.
     #
     # We have the following lifecycle events.
     #
     # - on_before_fork (on master process):
     #
-    #     Unicorn/Puma Cluster: This will be called exactly once,
+    #     Puma Cluster: This will be called exactly once,
     #       on startup, before the workers are forked. This is
     #       called in the PARENT/MASTER process.
     #
@@ -22,7 +22,7 @@ module Gitlab
     #
     # - on_master_start (on master process):
     #
-    #     Unicorn/Puma Cluster: This will be called exactly once,
+    #     Puma Cluster: This will be called exactly once,
     #       on startup, before the workers are forked. This is
     #       called in the PARENT/MASTER process.
     #
@@ -30,7 +30,7 @@ module Gitlab
     #
     # - on_before_blackout_period (on master process):
     #
-    #     Unicorn/Puma Cluster: This will be called before a blackout
+    #     Puma Cluster: This will be called before a blackout
     #       period when performing graceful shutdown of master.
     #       This is called on `master` process.
     #
@@ -38,7 +38,7 @@ module Gitlab
     #
     # - on_before_graceful_shutdown (on master process):
     #
-    #     Unicorn/Puma Cluster: This will be called before a graceful
+    #     Puma Cluster: This will be called before a graceful
     #       shutdown  of workers starts happening, but after blackout period.
     #       This is called on `master` process.
     #
@@ -46,11 +46,6 @@ module Gitlab
     #
     # - on_before_master_restart (on master process):
     #
-    #     Unicorn: This will be called before a new master is spun up.
-    #       This is called on forked master before `execve` to become
-    #       a new masterfor Unicorn. This means that this does not really
-    #       affect old master process.
-    #
     #     Puma Cluster: This will be called before a new master is spun up.
     #       This is called on `master` process.
     #
@@ -58,7 +53,7 @@ module Gitlab
     #
     # - on_worker_start (on worker process):
     #
-    #     Unicorn/Puma Cluster: This is called in the worker process
+    #     Puma Cluster: This is called in the worker process
     #       exactly once before processing requests.
     #
     #     Sidekiq/Puma Single: This is called immediately.
@@ -114,7 +109,7 @@ module Gitlab
         end
 
         #
-        # Lifecycle integration methods (called from unicorn.rb, puma.rb, etc.)
+        # Lifecycle integration methods (called from puma.rb, etc.)
         #
         def do_worker_start
           call(:worker_start_hooks, @worker_start_hooks)
diff --git a/lib/gitlab/cluster/puma_worker_killer_initializer.rb b/lib/gitlab/cluster/puma_worker_killer_initializer.rb
index fd9f58a34f3..e634291f894 100644
--- a/lib/gitlab/cluster/puma_worker_killer_initializer.rb
+++ b/lib/gitlab/cluster/puma_worker_killer_initializer.rb
@@ -12,12 +12,9 @@ module Gitlab
         require 'puma_worker_killer'
 
         PumaWorkerKiller.config do |config|
-          # Note! ram is expressed in megabytes (whereas GITLAB_UNICORN_MEMORY_MAX is in bytes)
-          # Importantly RAM is for _all_workers (ie, the cluster),
-          # not each worker as is the case with GITLAB_UNICORN_MEMORY_MAX
           worker_count = puma_options[:workers] || 1
-          # The Puma Worker Killer checks the total RAM used by both the master
-          # and worker processes.
+          # The Puma Worker Killer checks the total memory used by the cluster,
+          # i.e. both primary and worker processes.
           # https://github.com/schneems/puma_worker_killer/blob/v0.1.0/lib/puma_worker_killer/puma_memory.rb#L57
           #
           # Additional memory is added when running in `development`