diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-02-28 23:25:37 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-03-04 09:06:41 -0800 |
| commit | f0c52df5e540e825be0babd04cc557f3f40cf1c6 (patch) | |
| tree | 0d39c1df112c4ac71938c6051d65dc4751c9d526 /config | |
| parent | 6b507626ed3499c1796706b507c30b8f46c706b7 (diff) | |
| download | gitlab-ce-f0c52df5e540e825be0babd04cc557f3f40cf1c6.tar.gz | |
sidekiq: terminate child processes at shutdown
Sidekiq jobs frequently spawn long-lived child processes to do work.
In some circumstances, these can be reparented to init when sidekiq is
terminated, leading to duplication of work and strange concurrency
problems.
This commit changes sidekiq so that, if run as a process group leader,
it will forward `INT` and `TERM` signals to the whole process group. If
the memory killer is active, it will also use the process group when
resorting to `kill -9` to shut down.
These changes mean that a naive `kill <pid-of-sidekiq>` will now do the
right thing, killing any child processes spawned by sidekiq, as long as
the process supervisor placed it in its own process group.
If sidekiq isn't a process group leader, this new code is skipped.
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/sidekiq.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 4a8d72e37a5..2e4aa9c1053 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -77,6 +77,9 @@ Sidekiq.configure_server do |config| # Avoid autoload issue such as 'Mail::Parsers::AddressStruct' # https://github.com/mikel/mail/issues/912#issuecomment-214850355 Mail.eager_autoload! + + # Ensure the whole process group is terminated if possible + Gitlab::SidekiqSignals.install!(Sidekiq::CLI::SIGNAL_HANDLERS) end Sidekiq.configure_client do |config| |