diff options
| author | Valery Sizov <valery@gitlab.com> | 2019-08-20 14:47:38 +0300 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2019-08-20 19:09:33 +0300 |
| commit | 301b9c938674cdb4fe7f9a7c7eac718ac71e2dbe (patch) | |
| tree | 5c763b92e93160ece0e0433b0e6d14180d200ba0 | |
| parent | 84e7bc765c42643e8d1b30e4030172694f33901a (diff) | |
| download | gitlab-ce-60986-adjust_memory_killer.tar.gz | |
Adjust Sidekiq Memory killer shutdown wait time60986-adjust_memory_killer
30 seconds is not enough for jobs to finish
| -rw-r--r-- | changelogs/unreleased/60986-adjust_memory_killer.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/memory_killer.rb | 2 | ||||
| -rw-r--r-- | spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/changelogs/unreleased/60986-adjust_memory_killer.yml b/changelogs/unreleased/60986-adjust_memory_killer.yml new file mode 100644 index 00000000000..71f289a5ee4 --- /dev/null +++ b/changelogs/unreleased/60986-adjust_memory_killer.yml @@ -0,0 +1,5 @@ +--- +title: Adjust Sidekiq Memory killer shutdown wait time +merge_request: 32008 +author: +type: changed diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb index 49c4fdc3033..a8e5be7871f 100644 --- a/lib/gitlab/sidekiq_middleware/memory_killer.rb +++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb @@ -8,7 +8,7 @@ module Gitlab # Give Sidekiq 15 minutes of grace time after exceeding the RSS limit 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_WAIT = (ENV['SIDEKIQ_MEMORY_KILLER_SHUTDOWN_WAIT'] || 360).to_s.to_i # Create a mutex used to ensure there will be only one thread waiting to # shut Sidekiq down diff --git a/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb b/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb index 1de9a644610..f94f860fe71 100644 --- a/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb @@ -39,7 +39,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do expect(subject).to receive(:sleep).with(15 * 60).ordered expect(Process).to receive(:kill).with('SIGTSTP', pid).ordered - expect(subject).to receive(:sleep).with(30).ordered + expect(subject).to receive(:sleep).with(360).ordered expect(Process).to receive(:kill).with('SIGTERM', pid).ordered expect(subject).to receive(:sleep).with(10).ordered |