Adapt Puma config to support Puma 7
What does this MR do?
The Puma configuration template needs to be adjusted to work with Puma 7:
-
The callback hooks have been renamed in https://github.com/puma/puma/pull/3438:
-
on_worker_boot->before_worker_boot -
on_worker_shutdown->before_worker_shutdown -
on_restart->before_restart
-
This commit adds a conditional block based on the Puma version to use the new hooks.
- With https://github.com/puma/puma/pull/3297, Puma 7 raises an exception if Puma's options are accessed before they are fully loaded. Currently we pass these options during loading of the Puma config file, which then triggers this exception. These options are used to determine whether Puma is in clustered mode by checking the number of workers.
This commit uses a new method set_puma_worker_count added in
gitlab!204104 (merged).
Note that Puma 7.0.2 or higher is required because
https://github.com/puma/puma/pull/3731 fixes an upstream bug to make
Puma 7 work with queue_requests set to false.
set_puma_worker_count was added in
gitlab!204104 (merged).
The GDK config was also adapted similarly in gitlab-development-kit!5249 (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
-
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-packagejobs have a green pipeline running against latest commit. -
If config/softwareorconfig/patchesdirectories are changed, make sure thebuild-package-on-all-osjob within theTrigger:ee-packagedownstream pipeline succeeded. -
If you are changing anything SSL related, then the Trigger:package:fipsmanual job within theTrigger:ee-packagedownstream pipeline must succeed. -
If CI configuration is changed, the branch must be pushed to dev.gitlab.orgto 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, duration10s, URIscheme://user:passwd@host:portmay require quotation or other special handling when rendered in a template and written to a configuration file.