Download as
Browse Code »

Commit a271570ea9e0e53cf5574a1060d97a55145b583e

Authored by Marin Jankovski
1 parent 4886d8fd
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Show explanation .

Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
app/views/admin/background_jobs/show.html.haml
  Diff comments   View file @a271570
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 %h4 Sidekiq running processes 5 %h4 Sidekiq running processes
6 - sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep` 6 - sidekiq_processes = `ps -eo euser,pid,pcpu,pmem,stat,start,command | grep sidekiq | grep -v grep`
7 - if sidekiq_processes.empty? 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 - else 10 - else
10 .ui-box 11 .ui-box
11 %table.zebra-striped 12 %table.zebra-striped
@@ -25,9 +26,13 @@ @@ -25,9 +26,13 @@
25 %th COMMAND 26 %th COMMAND
26 %th 27 %th
27 - sidekiq_processes.split("\n").each do |process| 28 - sidekiq_processes.split("\n").each do |process|
  29 + - next unless process.match(/(sidekiq \d+\.\d+\.\d+.+$)/)
28 - data = process.gsub!(/\s+/m, '|').strip.split('|') 30 - data = process.gsub!(/\s+/m, '|').strip.split('|')
29 %tr 31 %tr
30 - 6.times do 32 - 6.times do
31 %td= data.shift 33 %td= data.shift
32 %td 34 %td
33 %td= data.join(" ") 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.