From 8e2752f4595db07197cacbf8c352e51b5268b71b Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Thu, 12 Jun 2014 10:42:38 +0200
Subject: [PATCH] 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'.
---
CHANGELOG | 1 +
bin/background_jobs | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index 435cc668f1e..2e4736a0803 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 7.0.0
- File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
- Overall performance improvements
- Skip init script check on omnibus-gitlab
+ - Be more selective when killing stray Sidekiqs
v 6.9.2
- Revert the commit that broke the LDAP user filter
diff --git a/bin/background_jobs b/bin/background_jobs
index e0140e9689b..c7ba4398cfb 100755
--- a/bin/background_jobs
+++ b/bin/background_jobs
@@ -18,7 +18,7 @@ function stop
function killall
{
- pkill -u $gitlab_user -f sidekiq
+ pkill -u $gitlab_user -f 'sidekiq [0-9]'
}
function restart
--
GitLab