Skip to content

Fix DISABLE_PUMA_WORKER_KILLER check

Matthias Käppler requested to merge mk-fix-pwk-switch into master

What does this MR do?

Equivalent fix to gitlab-org/gitlab!88928 (merged)

The check for DISABLE_PUMA_WORKER_KILLER was not correct, since it hosts a string value. This can lead to the PWK not running whenever the env var carries some non-nil value, including 1 or true, 0 or false.

I am not entirely clear on whether this file is manually managed in CNG or somehow generated from defaults in the Rails repository. It looks like there is a lot of duplication of configuration at GitLab for this component, which makes it difficult to maintain consistency.

Related issues

gitlab-org/gitlab#365954 (closed)

Test plan

  • Set DISABLE_PUMA_WORKER_KILLER to true or 1
  • The PWK should now be running (look for PumaWorkerKiller logs in puma.stdout)

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 Matthias Käppler

Merge request reports