Merge branch 'fix/sidekiq-mem-killer-debug' into 'master'

Better debugging for memory killer middleware This adds more info to the warning messages output by `MemoryKiller`. Previously only the PID was showed, making it difficult to debug issues like https://gitlab.com/gitlab-org/gitlab-ce/issues/19124 This adds the worker class and job ID to the log messages. See merge request !4936

Merge branch 'fix/sidekiq-mem-killer-debug' into 'master'
3659992c · Rémy Coutable · 4f39e727 · e69af6d2 · 3659992c
Commit 3659992c authored Jun 27, 2016 by Rémy Coutable
Show 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
@@ -25,7 +25,7 @@ module Gitlab

          Sidekiq.logger.warn "current RSS #{current_rss} exceeds maximum RSS "\
            "#{MAX_RSS}"
-          Sidekiq.logger.warn "this thread will shut down PID #{Process.pid} "\
+          Sidekiq.logger.warn "this thread will shut down PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"\
            "in #{GRACE_TIME} seconds"
          sleep(GRACE_TIME)

@@ -36,7 +36,7 @@ module Gitlab
            "#{SHUTDOWN_SIGNAL} to PID #{Process.pid}"
          sleep(SHUTDOWN_WAIT)

-          Sidekiq.logger.warn "sending #{SHUTDOWN_SIGNAL} to PID #{Process.pid}"
+          Sidekiq.logger.warn "sending #{SHUTDOWN_SIGNAL} to PID #{Process.pid} - Worker #{worker.class} - JID-#{job['jid']}"
          Process.kill(SHUTDOWN_SIGNAL, Process.pid)
        end
      end