Commit ffef71d9 authored by Stan Hu's avatar Stan Hu

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
parents 7ded28ff 103c4053
......@@ -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}"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment