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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
661f5136
Commit
661f5136
authored
Nov 13, 2019
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Increase PumaWorkerKiller memory limit for dev
parent
c7a1d498
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
lib/gitlab/cluster/puma_worker_killer_initializer.rb
lib/gitlab/cluster/puma_worker_killer_initializer.rb
+11
-2
No files found.
lib/gitlab/cluster/puma_worker_killer_initializer.rb
View file @
661f5136
...
...
@@ -3,7 +3,12 @@
module
Gitlab
module
Cluster
class
PumaWorkerKillerInitializer
def
self
.
start
(
puma_options
,
puma_per_worker_max_memory_mb:
850
,
puma_master_max_memory_mb:
550
)
def
self
.
start
(
puma_options
,
puma_per_worker_max_memory_mb:
850
,
puma_master_max_memory_mb:
550
,
puma_dev_max_memory_mb:
200
)
require
'puma_worker_killer'
PumaWorkerKiller
.
config
do
|
config
|
...
...
@@ -14,7 +19,11 @@ module Gitlab
# The Puma Worker Killer checks the total RAM used by both the master
# and worker processes.
# https://github.com/schneems/puma_worker_killer/blob/v0.1.0/lib/puma_worker_killer/puma_memory.rb#L57
config
.
ram
=
puma_master_max_memory_mb
+
(
worker_count
*
puma_per_worker_max_memory_mb
)
#
# Additional memory is added when running in `development`
config
.
ram
=
puma_master_max_memory_mb
+
(
worker_count
*
puma_per_worker_max_memory_mb
)
+
(
Rails
.
env
.
development?
?
(
1
+
worker_count
)
*
puma_dev_max_memory_mb
:
0
)
config
.
frequency
=
20
# seconds
...
...
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