diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-18 20:02:30 +0000 |
| commit | 41fe97390ceddf945f3d967b8fdb3de4c66b7dea (patch) | |
| tree | 9c8d89a8624828992f06d892cd2f43818ff5dcc8 /sidekiq_cluster/sidekiq_cluster.rb | |
| parent | 0804d2dc31052fb45a1efecedc8e06ce9bc32862 (diff) | |
| download | gitlab-ce-41fe97390ceddf945f3d967b8fdb3de4c66b7dea.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42
Diffstat (limited to 'sidekiq_cluster/sidekiq_cluster.rb')
| -rw-r--r-- | sidekiq_cluster/sidekiq_cluster.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sidekiq_cluster/sidekiq_cluster.rb b/sidekiq_cluster/sidekiq_cluster.rb index c5139ab8874..c68cbe7c163 100644 --- a/sidekiq_cluster/sidekiq_cluster.rb +++ b/sidekiq_cluster/sidekiq_cluster.rb @@ -4,8 +4,6 @@ require_relative '../lib/gitlab/process_management' module Gitlab module SidekiqCluster - CHECK_TERMINATE_INTERVAL_SECONDS = 1 - # How long to wait when asking for a clean termination. # It maps the Sidekiq default timeout: # https://github.com/mperham/sidekiq/wiki/Signals#term @@ -14,8 +12,12 @@ module Gitlab # is given through arguments. DEFAULT_SOFT_TIMEOUT_SECONDS = 25 - # After surpassing the soft timeout. - DEFAULT_HARD_TIMEOUT_SECONDS = 5 + # Additional time granted after surpassing the soft timeout + # before we kill the process. + TIMEOUT_GRACE_PERIOD_SECONDS = 5 + + # The singleton instance used to supervise cluster processes. + SidekiqProcessSupervisor = Class.new(Gitlab::ProcessSupervisor) # Starts Sidekiq workers for the pairs of processes. # |