Skip to content

Raise Sidekiq job timeout from 5 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. We found that the 5-second value set in Charts was too low. Some jobs were being prematurely killed, causing jobs to be marked in the deduplication middleware but not actually enqueued (gitlab-org/gitlab#344151 (comment 718793765)).

Note that the pod timeout is 30 seconds, so this value should still work with that.

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
  • Tests added
  • Integration tests added to GitLab QA
  • Equivalent MR/issue for omnibus-gitlab opened
Edited by Jason Plum

Merge request reports