diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-10 18:47:20 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-12 00:39:34 +0300 |
| commit | 821ca59c213732d2120c2d767ce0b30560057a4c (patch) | |
| tree | 48d78851f57a5eb7637966366fe83274e8be0d42 | |
| parent | 8803664028b49a14e7a3d04d9baccfba3a4bda8b (diff) | |
Merge branch 'more-pgroup-fix' into 'master'
Fix the last-ditch memory killer pgroup SIGKILL
See merge request gitlab-org/gitlab-ce!25940
(cherry picked from commit 253bad8cebc83ce0b011ffb61a060be985e1c196)
452f5081 Fix the last-ditch memory killer pgroup SIGKILL
| -rw-r--r-- | changelogs/unreleased/more-pgroup-fix.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/more-pgroup-fix.yml b/changelogs/unreleased/more-pgroup-fix.yml new file mode 100644 index 00000000000..6e85205ccba --- /dev/null +++ b/changelogs/unreleased/more-pgroup-fix.yml @@ -0,0 +1,5 @@ +--- +title: Fix the last-ditch memory killer pgroup SIGKILL +merge_request: 25940 +author: +type: fixed diff --git a/lib/gitlab/sidekiq_middleware/memory_killer.rb b/lib/gitlab/sidekiq_middleware/memory_killer.rb index ed2c7ee9a2d..671d795ec33 100644 --- a/lib/gitlab/sidekiq_middleware/memory_killer.rb +++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb @@ -63,7 +63,7 @@ module Gitlab sleep(time) Sidekiq.logger.warn "sending Sidekiq worker PGRP-#{pid} #{signal} (#{explanation})" - Process.kill(signal, "-#{pid}") + Process.kill(signal, 0) end def wait_and_signal(time, signal, explanation) diff --git a/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb b/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb index ff8c0825ee4..1a5a38b5d99 100644 --- a/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb +++ b/spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb @@ -54,7 +54,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do expect(Process).to receive(:kill).with('SIGTSTP', pid).ordered expect(Process).to receive(:kill).with('SIGTERM', pid).ordered - expect(Process).to receive(:kill).with('SIGKILL', "-#{pid}").ordered + expect(Process).to receive(:kill).with('SIGKILL', 0).ordered run end |