Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
adddbf43
Commit
adddbf43
authored
Mar 01, 2019
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SIGSTP should be SIGTSTP
parent
b98fd8a5
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/sidekiq_middleware/memory_killer.rb
lib/gitlab/sidekiq_middleware/memory_killer.rb
+1
-1
spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb
spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb
+1
-1
No files found.
lib/gitlab/sidekiq_middleware/memory_killer.rb
View file @
adddbf43
...
@@ -31,7 +31,7 @@ module Gitlab
...
@@ -31,7 +31,7 @@ module Gitlab
# Wait `GRACE_TIME` to give the memory intensive job time to finish.
# Wait `GRACE_TIME` to give the memory intensive job time to finish.
# Then, tell Sidekiq to stop fetching new jobs.
# Then, tell Sidekiq to stop fetching new jobs.
wait_and_signal
(
GRACE_TIME
,
'SIGSTP'
,
'stop fetching new jobs'
)
wait_and_signal
(
GRACE_TIME
,
'SIG
T
STP'
,
'stop fetching new jobs'
)
# Wait `SHUTDOWN_WAIT` to give already fetched jobs time to finish.
# Wait `SHUTDOWN_WAIT` to give already fetched jobs time to finish.
# Then, tell Sidekiq to gracefully shut down by giving jobs a few more
# Then, tell Sidekiq to gracefully shut down by giving jobs a few more
...
...
spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb
View file @
adddbf43
...
@@ -37,7 +37,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do
...
@@ -37,7 +37,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do
it
'sends the STP, TERM and KILL signals at expected times'
do
it
'sends the STP, TERM and KILL signals at expected times'
do
expect
(
subject
).
to
receive
(
:sleep
).
with
(
15
*
60
).
ordered
expect
(
subject
).
to
receive
(
:sleep
).
with
(
15
*
60
).
ordered
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIGSTP'
,
pid
).
ordered
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIG
T
STP'
,
pid
).
ordered
expect
(
subject
).
to
receive
(
:sleep
).
with
(
30
).
ordered
expect
(
subject
).
to
receive
(
:sleep
).
with
(
30
).
ordered
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIGTERM'
,
pid
).
ordered
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIGTERM'
,
pid
).
ordered
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment