This instance will be upgraded to Heptapod 0.31.0rc on 2022-05-19 at 11:00 UTC+2 (a few minutes of down time)

Commit 50f2db27 authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'

Explicitly set cwd in Sidekiq memory killer instead of depending on getcwd

See merge request gitlab-org/gitlab-ce!16954
...@@ -45,7 +45,7 @@ def call(worker, job, queue) ...@@ -45,7 +45,7 @@ def call(worker, job, queue)
private private
def get_rss def get_rss
output, status = Gitlab::Popen.popen(%W(ps -o rss= -p #{pid})) output, status = Gitlab::Popen.popen(%W(ps -o rss= -p #{pid}), Rails.root.to_s)
return 0 unless status.zero? return 0 unless status.zero?
output.to_i output.to_i
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment