Sidekiq runit service: Set custom timeout

What does this MR do?

Sidekiq runit service: Set custom timeout

The Runit timeout is seven seconds by default. In the Sidekiq cluster, The default shutdown timeout is set to 25 seconds. In addition to the shutdown timeout, Sidekiq cluster waits an additional five seconds for child processes.

https://gitlab.com/gitlab-org/gitlab/-/blob/691ddb9d5cc3254cc1cc98e5602b1ed578e673b8/config/initializers/sidekiq_cluster.rb#L19

The discrepancy between the service- and application-level timeouts causes Sidekiq restarts to fail in GitLab 18.0 and later versions.

Changelog: fixed

Closes #9136 (closed)

Related issues

Test Plan

  1. Install + reconfigure GitLab
  2. Set a setting that triggers a sidekiq restart (e.g. gitlab_rails['gitlab_default_theme'])
  3. reconfigure
  4. Confirm Sidekiq restart passes without timeout

Checklist

See Definition of done.

For anything in this list which will not be completed, please provide a reason in the MR discussion.

Required

  • MR title and description are up to date, accurate, and descriptive.
  • MR targeting the appropriate branch.
  • Latest Merge Result pipeline is green.
  • When ready for review, MR is labeled workflowready for review per the Distribution MR workflow.

For GitLab team members

If you don't have access to this, the reviewer should trigger these jobs for you during the review process.

  • The manual Trigger:ee-package jobs have a green pipeline running against latest commit.
  • If config/software or config/patches directories are changed, make sure the build-package-on-all-os job within the Trigger:ee-package downstream pipeline succeeded.
  • If you are changing anything SSL related, then the Trigger:package:fips manual job within the Trigger:ee-package downstream pipeline must succeed.
  • If CI configuration is changed, the branch must be pushed to dev.gitlab.org to confirm regular branch builds aren't broken.

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes.
  • Documentation created/updated.
  • Tests added.
  • Integration tests added to GitLab QA.
  • Equivalent MR/issue for the GitLab Chart opened.
  • Validate potential values for new configuration settings. Formats such as integer 10, duration 10s, URI scheme://user:passwd@host:port may require quotation or other special handling when rendered in a template and written to a configuration file.
Edited by Clemens Beck

Merge request reports

Loading