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
Boxiang Sun
gitlab-ce
Commits
452f5081
Commit
452f5081
authored
Mar 09, 2019
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the last-ditch memory killer pgroup SIGKILL
parent
106888fb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
changelogs/unreleased/more-pgroup-fix.yml
changelogs/unreleased/more-pgroup-fix.yml
+5
-0
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.
changelogs/unreleased/more-pgroup-fix.yml
0 → 100644
View file @
452f5081
---
title
:
Fix the last-ditch memory killer pgroup SIGKILL
merge_request
:
25940
author
:
type
:
fixed
lib/gitlab/sidekiq_middleware/memory_killer.rb
View file @
452f5081
...
@@ -63,7 +63,7 @@ module Gitlab
...
@@ -63,7 +63,7 @@ module Gitlab
sleep
(
time
)
sleep
(
time
)
Sidekiq
.
logger
.
warn
"sending Sidekiq worker PGRP-
#{
pid
}
#{
signal
}
(
#{
explanation
}
)"
Sidekiq
.
logger
.
warn
"sending Sidekiq worker PGRP-
#{
pid
}
#{
signal
}
(
#{
explanation
}
)"
Process
.
kill
(
signal
,
"-
#{
pid
}
"
)
Process
.
kill
(
signal
,
0
)
end
end
def
wait_and_signal
(
time
,
signal
,
explanation
)
def
wait_and_signal
(
time
,
signal
,
explanation
)
...
...
spec/lib/gitlab/sidekiq_middleware/memory_killer_spec.rb
View file @
452f5081
...
@@ -54,7 +54,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do
...
@@ -54,7 +54,7 @@ describe Gitlab::SidekiqMiddleware::MemoryKiller do
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIGTSTP'
,
pid
).
ordered
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIGTSTP'
,
pid
).
ordered
expect
(
Process
).
to
receive
(
:kill
).
with
(
'SIGTERM'
,
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
run
end
end
...
...
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