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
fcea6c49
Commit
fcea6c49
authored
Nov 13, 2019
by
Aleksei Lipniagov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply review suggestions
parent
cafbc08d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/cluster/puma_worker_killer_initializer.rb
lib/gitlab/cluster/puma_worker_killer_initializer.rb
+2
-2
No files found.
lib/gitlab/cluster/puma_worker_killer_initializer.rb
View file @
fcea6c49
...
...
@@ -7,7 +7,7 @@ module Gitlab
puma_options
,
puma_per_worker_max_memory_mb:
850
,
puma_master_max_memory_mb:
550
,
puma_dev_max_memory_mb:
200
additional_
puma_dev_max_memory_mb:
200
)
require
'puma_worker_killer'
...
...
@@ -23,7 +23,7 @@ module Gitlab
# 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
)
(
Rails
.
env
.
development?
?
(
1
+
worker_count
)
*
additional_
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