Skip to content

Raise Sidekiq job timeout from 4 to 25 seconds

Stan Hu requested to merge sh-raise-sidekiq-timeout into master

What does this MR do?

As described in https://github.com/mperham/sidekiq/wiki/Signals#term, Sidekiq by default will wait 25 seconds for jobs to terminate after receiving a TERM signal. The current default of 4 seconds is a bit too low. Although this value is actually set in Charts, we are setting in the containers to be consistent.

The change mirrors the Charts update in gitlab-org/charts/gitlab!2249 (merged).

Related issues

Checklist

See Definition of done.

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

Required

  • Merge Request Title, and Description are up to date, accurate, and descriptive
  • MR targeting the appropriate branch
  • MR has a green pipeline on GitLab.com

Expected (please provide an explanation if not completing)

  • Test plan indicating conditions for success has been posted and passes
  • Documentation created/updated
  • Integration tests added to GitLab QA
  • The impact any change in container size has should be evaluated
Edited by Stan Hu

Merge request reports