kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '40396-fix-sig-stp' into 'master' 

SIGSTP should be SIGTSTP

Closes #40396

See merge request gitlab-org/gitlab-ce!25682
This commit is contained in:
Douwe Maan 2019-03-01 12:01:17 +00:00
parent 728e80798b adddbf437d
commit 6b507626ed
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/gitlab/sidekiq_middleware/memory_killer.rb
View File

@ -31,7 +31,7 @@ module Gitlab
# Wait `GRACE_TIME` to give the memory intensive job time to finish.
# Then, tell Sidekiq to stop fetching new jobs.
wait_and_signal(GRACE_TIME, 'SIGSTP', 'stop fetching new jobs')
wait_and_signal(GRACE_TIME, 'SIGTSTP', 'stop fetching new jobs')
# Wait `SHUTDOWN_WAIT` to give already fetched jobs time to finish.
# Then, tell Sidekiq to gracefully shut down by giving jobs a few more

2
spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb
View File

@ -37,7 +37,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do
it 'sends the STP, TERM and KILL signals at expected times' do
expect(subject).to receive(:sleep).with(15 * 60).ordered
expect(Process).to receive(:kill).with('SIGSTP', pid).ordered
expect(Process).to receive(:kill).with('SIGTSTP', pid).ordered
expect(subject).to receive(:sleep).with(30).ordered
expect(Process).to receive(:kill).with('SIGTERM', pid).ordered