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

Merge branch 'dm-sidekiq-memory-killer-getcwd' into 'master'
8999d8eb · Stan Hu · dffd5669 · 87685428 · 8999d8eb
Commit 8999d8eb authored Feb 06, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

memory_killer.rb lib/gitlab/sidekiq_middleware/memory_killer.rb +1 -1

No files found.
--- a/lib/gitlab/sidekiq_middleware/memory_killer.rb
+++ b/lib/gitlab/sidekiq_middleware/memory_killer.rb
@@ -45,7 +45,7 @@ module Gitlab
      private

      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?

        output.to_i