Download as
Browse Code »

Commit 8e2752f4595db07197cacbf8c352e51b5268b71b

Authored by Jacob Vosmaer
1 parent 11e1c013
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Be more selective when killing stray Sidekiqs 

Avoid the background_jobs script killing every process with 'sidekiq' in
its argument string (e.g. 'rake gitlab:sidekiq start') by also catching
the number (2) in 'sidekiq 2.14'.
Showing 2 changed files with 2 additions and 1 deletions   Show diff stats
@@ -32,6 +32,7 @@ v 7.0.0 @@ -32,6 +32,7 @@ v 7.0.0
32 - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one 32 - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
33 - Overall performance improvements 33 - Overall performance improvements
34 - Skip init script check on omnibus-gitlab 34 - Skip init script check on omnibus-gitlab
  35 + - Be more selective when killing stray Sidekiqs
35 36
36 v 6.9.2 37 v 6.9.2
37 - Revert the commit that broke the LDAP user filter 38 - Revert the commit that broke the LDAP user filter
bin/background_jobs
  Diff comments   View file @8e2752f
@@ -18,7 +18,7 @@ function stop @@ -18,7 +18,7 @@ function stop
18 18
19 function killall 19 function killall
20 { 20 {
21 - pkill -u $gitlab_user -f sidekiq 21 + pkill -u $gitlab_user -f 'sidekiq [0-9]'
22 } 22 }
23 23
24 function restart 24 function restart