Commit 821ca59c authored by Stan Hu's avatar Stan Hu Committed by GitLab Release Tools Bot

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 253bad8c)

452f5081 Fix the last-ditch memory killer pgroup SIGKILL
parent 88036640
---
title: Fix the last-ditch memory killer pgroup SIGKILL
merge_request: 25940
author:
type: fixed
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment