Merge branch 'fix_rake_gitlab_check_sidekiq' into 'master'

Make bundle exec rake gitlab:check RAILS_ENV=production

Closes #30084

See merge request !10246
This commit is contained in:
Rémy Coutable 2017-03-29 17:16:13 +00:00
commit b351a77a52
3 changed files with 7 additions and 3 deletions

View file

@ -1,6 +1,6 @@
class Admin::BackgroundJobsController < Admin::ApplicationController class Admin::BackgroundJobsController < Admin::ApplicationController
def show def show
ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) ps_output, _ = Gitlab::Popen.popen(%W(ps ww -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command))
@sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/)
@concurrency = Sidekiq.options[:concurrency] @concurrency = Sidekiq.options[:concurrency]
end end

View file

@ -0,0 +1,4 @@
---
title: Force unlimited terminal size when checking processes via call to ps
merge_request: 10246
author: Sebastian Reitenbach

View file

@ -617,7 +617,7 @@ namespace :gitlab do
end end
def sidekiq_process_count def sidekiq_process_count
ps_ux, _ = Gitlab::Popen.popen(%w(ps ux)) ps_ux, _ = Gitlab::Popen.popen(%w(ps uxww))
ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count ps_ux.scan(/sidekiq \d+\.\d+\.\d+/).count
end end
end end
@ -751,7 +751,7 @@ namespace :gitlab do
end end
def mail_room_running? def mail_room_running?
ps_ux, _ = Gitlab::Popen.popen(%w(ps ux)) ps_ux, _ = Gitlab::Popen.popen(%w(ps uxww))
ps_ux.include?("mail_room") ps_ux.include?("mail_room")
end end
end end