Merge branch 'fix-sidekiq-process-group-killing' into 'master'

Fix Sidekiq process group killing

See merge request gitlab-org/gitlab-ce!25866
This commit is contained in:
Stan Hu 2019-03-07 13:18:41 +00:00
commit 2b86f45c5c
2 changed files with 6 additions and 3 deletions

View File

@ -35,8 +35,11 @@ module Gitlab
# signals from outside the process group, but that isn't fatal.
def self.blindly_signal_pgroup!(signal)
old_trap = trap(signal, 'IGNORE')
Process.kill(signal, "-#{Process.getpgrp}")
trap(signal, old_trap)
begin
Process.kill(signal, 0)
ensure
trap(signal, old_trap)
end
end
end
end

View File

@ -44,7 +44,7 @@ describe Gitlab::SidekiqSignals do
expect(Process)
.to receive(:kill)
.with(signal, "-#{Process.pid}")
.with(signal, 0)
.ordered
expect(described_class)