diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-02-20 11:22:13 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-02-20 11:22:13 +0000 |
| commit | dc303fe2dbc422b71e61897443741f78f0138e82 (patch) | |
| tree | 434bbd54e20317280757fce43aa52a5a23ca7572 | |
| parent | f8a736d028c09927454c86a9e192dadc6d1e2600 (diff) | |
| parent | bfb686bd08a165c0385dbe5f962f532c7ba59b63 (diff) | |
| download | gitlab-ce-dc303fe2dbc422b71e61897443741f78f0138e82.tar.gz | |
Merge branch 'fix_sidekiq_concurrency_warning_message_in_admin_background_job_page' into 'master'
fix incorrect sidekiq concurrency count in admin background page
Closes #19862
See merge request !9359
3 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/admin/background_jobs_controller.rb b/app/controllers/admin/background_jobs_controller.rb index 338496013a0..c09095b9849 100644 --- a/app/controllers/admin/background_jobs_controller.rb +++ b/app/controllers/admin/background_jobs_controller.rb @@ -2,5 +2,6 @@ class Admin::BackgroundJobsController < Admin::ApplicationController def show ps_output, _ = Gitlab::Popen.popen(%W(ps -U #{Gitlab.config.gitlab.user} -o pid,pcpu,pmem,stat,start,command)) @sidekiq_processes = ps_output.split("\n").grep(/sidekiq/) + @concurrency = Sidekiq.options[:concurrency] end end diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index 4f982a6e369..ac36bb5bb17 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -35,7 +35,7 @@ .clearfix %p %i.fa.fa-exclamation-circle - If '[25 of 25 busy]' is shown, restart GitLab with 'sudo service gitlab reload'. + If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab with 'sudo service gitlab reload'. %p %i.fa.fa-exclamation-circle If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{gitlab_config.user} -f sidekiq) and restart GitLab. diff --git a/changelogs/unreleased/fix_sidekiq_concurrency_warning_message_in_admin_background_job_page.yml b/changelogs/unreleased/fix_sidekiq_concurrency_warning_message_in_admin_background_job_page.yml new file mode 100644 index 00000000000..e09d03bb608 --- /dev/null +++ b/changelogs/unreleased/fix_sidekiq_concurrency_warning_message_in_admin_background_job_page.yml @@ -0,0 +1,4 @@ +--- +title: fix incorrect sidekiq concurrency count in admin background page +merge_request: +author: wendy0402 |