Show explanation .

Marin Jankovski
1 parent 4886d8fd
Showing 1 changed file with 6 additions and 1 deletions Show diff stats
app/views/admin/background_jobs/show.html.haml
@@ -5,7 +5,8 @@
 %h4 Sidekiq running processes
 - sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
 - if sidekiq_processes.empty?
-  %b There is no running sidekiq process
+  %b There are no running sidekiq processes
+  %b Please restart GitLab
 - else
   .ui-box
     %table.zebra-striped
@@ -25,9 +26,13 @@
         %th COMMAND
         %th
         - sidekiq_processes.split("\n").each do |process|
+          - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
           - data = process.gsub!(/\s+/m, '|').strip.split('|')
           %tr
             - 6.times do
               %td= data.shift
               %td
             %td= data.join(" ")
+  %b If '[25 of 25 busy]' is shown, restart GitLab.
+  %br
+  %b If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u git -f sidekiq) and restart GitLab.
...	...	@@ -5,7 +5,8 @@
5	5	%h4 Sidekiq running processes
6	6	- sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command \| grep sidekiq \| grep -v grep`
7	7	- if sidekiq_processes.empty?
8		- %b There is no running sidekiq process
	8	+ %b There are no running sidekiq processes
	9	+ %b Please restart GitLab
9	10	- else
10	11	.ui-box
11	12	%table.zebra-striped
...	...	@@ -25,9 +26,13 @@
25	26	%th COMMAND
26	27	%th
27	28	- sidekiq_processes.split("\n").each do \|process\|
	29	+ - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
28	30	- data = process.gsub!(/\s+/m, '\|').strip.split('\|')
29	31	%tr
30	32	- 6.times do
31	33	%td= data.shift
32	34	%td
33	35	%td= data.join(" ")
	36	+ %b If '[25 of 25 busy]' is shown, restart GitLab.
	37	+ %br
	38	+ %b If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u git -f sidekiq) and restart GitLab.
...	...