Merge branch 'sidekiq-memory-sigterm' into 'master'

Use SIGTERM during Sidekiq memory shutdown This makes the memory killer behave more like 'sidekiqctl stop'. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15359 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14462 See merge request !3853

Merge branch 'sidekiq-memory-sigterm' into 'master'
ffef71d9 · Stan Hu · 7ded28ff · 103c4053 · ffef71d9
Commit ffef71d9 authored Apr 21, 2016 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

memory_killer.rb lib/gitlab/sidekiq_middleware/memory_killer.rb +2 -2

No files found.
--- a/lib/gitlab/sidekiq_middleware/memory_killer.rb
+++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb
@@ -29,8 +29,8 @@ module Gitlab
            "in #{GRACE_TIME} seconds"
          sleep(GRACE_TIME)

-          Sidekiq.logger.warn "sending SIGUSR1 to PID #{Process.pid}"
-          Process.kill('SIGUSR1', Process.pid)
+          Sidekiq.logger.warn "sending SIGTERM to PID #{Process.pid}"
+          Process.kill('SIGTERM', Process.pid)

          Sidekiq.logger.warn "waiting #{SHUTDOWN_WAIT} seconds before sending "\
            "#{SHUTDOWN_SIGNAL} to PID #{Process.pid}"