Merge branch 'more-pgroup-fix' into 'master'

Fix the last-ditch memory killer pgroup SIGKILL

See merge request gitlab-org/gitlab-ce!25940

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