From c291ff9c6f795821e5b73447984e4cd72f3701a4 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 13 May 2015 17:09:12 +0200 Subject: Use SIGKILL by default in Sidekiq::MemoryKiller This makes the memory growth-triggered Sidekiq restarts more reliable by reducing the chance that Sidekiq ends up in a state where it is not accepting new jobs but also not shutting down: SIGKILL is more likely to work than SIGTERM. --- CHANGELOG | 1 + lib/gitlab/sidekiq_middleware/memory_killer.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index f059345a5a3..a06509c7c79 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -57,6 +57,7 @@ v 7.11.0 (unreleased) - Show user roles by comments. - Fix automatic blocking of auto-created users from Active Directory. - Call merge request web hook for each new commits (Arthur Gautier) + - Use SIGKILL by default in Sidekiq::MemoryKiller v 7.10.2 - Fix CI links on MR page diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb index f33b2dedf4a..37232743325 100644 --- a/lib/gitlab/sidekiq_middleware/memory_killer.rb +++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb @@ -7,7 +7,7 @@ module Gitlab GRACE_TIME = (ENV['SIDEKIQ_MEMORY_KILLER_GRACE_TIME'] || 15 * 60).to_s.to_i # Wait 30 seconds for running jobs to finish during graceful shutdown SHUTDOWN_WAIT = (ENV['SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT'] || 30).to_s.to_i - SHUTDOWN_SIGNAL = (ENV['SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL'] || 'SIGTERM').to_s + SHUTDOWN_SIGNAL = (ENV['SIDEKIQ_MEMORY_KILLER_SHUTDOWN_SIGNAL'] || 'SIGKILL').to_s # Create a mutex used to ensure there will be only one thread waiting to # shut Sidekiq down -- cgit v1.2.1