diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-02 21:10:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-02 21:10:05 +0300 |
| commit | 983f6954d19f269a059aab1754568737d9ab6f64 (patch) | |
| tree | 399b8b75abf57118df941af3b485b85a0fb60540 /lib/gitlab/sidekiq_daemon | |
| parent | e36443c1d657343410d3de25d52ae0fe9ee67d8d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_daemon')
| -rw-r--r-- | lib/gitlab/sidekiq_daemon/memory_killer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_daemon/memory_killer.rb b/lib/gitlab/sidekiq_daemon/memory_killer.rb index b8f86b92844..b440ee5dd21 100644 --- a/lib/gitlab/sidekiq_daemon/memory_killer.rb +++ b/lib/gitlab/sidekiq_daemon/memory_killer.rb @@ -221,7 +221,7 @@ module Gitlab end def get_rss_kb - Gitlab::Metrics::System.memory_usage_rss / 1.kilobytes + Gitlab::Metrics::System.memory_usage_rss[:total] / 1.kilobytes end def get_soft_limit_rss_kb |