diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-12 18:22:10 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-12 18:22:10 +0000 |
| commit | 988ac03b89746d1c8ab71bbeac3a65ed53771b43 (patch) | |
| tree | 3b933cbadafc99ad75c4791ed7d1d1989f351dae | |
| parent | 11e1c0134195270eabd2774055713699450ba49d (diff) | |
| parent | 8e2752f4595db07197cacbf8c352e51b5268b71b (diff) | |
| download | gitlab-ce-988ac03b89746d1c8ab71bbeac3a65ed53771b43.tar.gz | |
Merge branch 'careful_sidekiq_kill' into 'master'
Be more selective when killing stray Sidekiqs
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rwxr-xr-x | bin/background_jobs | 2 |
2 files changed, 2 insertions, 1 deletions
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 |