diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-03-10 15:47:20 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-03-11 21:39:34 +0000 |
| commit | 821ca59c213732d2120c2d767ce0b30560057a4c (patch) | |
| tree | 48d78851f57a5eb7637966366fe83274e8be0d42 /lib | |
| parent | 8803664028b49a14e7a3d04d9baccfba3a4bda8b (diff) | |
| download | gitlab-ce-821ca59c213732d2120c2d767ce0b30560057a4c.tar.gz | |
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/sidekiq_middleware/memory_killer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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) |