Skip to content
Snippets Groups Projects
Commit a29fbc21 authored by wendy0402's avatar wendy0402
Browse files

fix incorrect sidekiq concurrency count in admin background page

parent 6eb45df2
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -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
Loading
Loading
@@ -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.
Loading
Loading
---
title: fix incorrect sidekiq concurrency count in admin background page
merge_request:
author: wendy0402
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment