Remove puma worker killer
What does this MR do and why?
Removes puma-worker-killer
We are using backward-compatible Watchdog by default for several releases. This is just a cleanup
Please note that we have are initializing PumaWorkerKiller in puma.rb templates used by omnibus and CNG, So I created 2 separate MR to clean this first:
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Related to #379199 (closed)
Merge request reports
Activity
changed milestone to %16.0
assigned to @nmilojevic1
- A deleted user
added backend label
1 Error The merge request title must not end with a period. For more information, take a look at our Commit message guidelines. Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Minahil Nichols (
@minahilnichols
) (UTC-4, 6 hours behind@nmilojevic1
)Jan Provaznik (
@jprovaznik
) (UTC+2, same timezone as@nmilojevic1
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
Rubygems
This merge request adds, or changes a Rubygems dependency. Please review the Gemfile guidelines.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
Dangeradded 49 commits
-
556f64e6...ed34bda9 - 47 commits from branch
master
- 4b8b654f - Remove puma worker killer
- e10dc7c6 - Fix Gemfile.lock
-
556f64e6...ed34bda9 - 47 commits from branch
Reviewer roulette
Changes that require review have been detected!
Please refer to the table below for assigning reviewers and maintainers suggested by Danger in the specified category:
Category Reviewer Maintainer backend Alex Buijs (
@alexbuijs
) (UTC+2, same timezone as@nmilojevic1
)Patrick Bajao (
@patrickbajao
) (UTC+8, 6 hours ahead of@nmilojevic1
)To spread load more evenly across eligible reviewers, Danger has picked a candidate for each review slot, based on their timezone. Feel free to override these selections if you think someone else would be better-suited or use the GitLab Review Workload Dashboard to find other available reviewers.
To read more on how to use the reviewer roulette, please take a look at the Engineering workflow and code review guidelines. Please consider assigning a reviewer or maintainer who is a domain expert in the area of the merge request.
Once you've decided who will review this merge request, assign them as a reviewer! Danger does not automatically notify them for you.
Rubygems
This merge request adds, or changes a Rubygems dependency. Please review the Gemfile guidelines.
If needed, you can retry the
danger-review
job that generated this comment.Generated by
DangerAllure report
allure-report-publisher
generated test report!e2e-test-on-gdk:
test report for 8ef0e7b5expand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Create | 8 | 0 | 1 | 0 | 9 | ✅ | | Plan | 4 | 0 | 0 | 0 | 4 | ✅ | | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Framework sanity | 0 | 0 | 1 | 0 | 1 | ➖ | | Data Stores | 2 | 0 | 0 | 0 | 2 | ✅ | | Govern | 2 | 0 | 0 | 0 | 2 | ✅ | | Manage | 1 | 0 | 0 | 0 | 1 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 21 | 0 | 2 | 0 | 23 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+
e2e-review-qa:
test report for 8ef0e7b5expand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Plan | 50 | 0 | 1 | 0 | 51 | ✅ | | Govern | 24 | 0 | 0 | 0 | 24 | ✅ | | Manage | 8 | 0 | 3 | 0 | 11 | ✅ | | Create | 27 | 0 | 1 | 0 | 28 | ✅ | | Verify | 10 | 0 | 0 | 0 | 10 | ✅ | | Data Stores | 22 | 0 | 0 | 0 | 22 | ✅ | | Monitor | 4 | 0 | 0 | 0 | 4 | ✅ | | Package | 0 | 0 | 1 | 0 | 1 | ➖ | | Framework sanity | 9 | 0 | 1 | 0 | 10 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 154 | 0 | 7 | 0 | 161 | ✅ | +------------------+--------+--------+---------+-------+-------+--------+
e2e-package-and-test:
test report for 8ef0e7b5expand test summary
+-----------------------------------------------------------------------+ | suites summary | +------------------+--------+--------+---------+-------+-------+--------+ | | passed | failed | skipped | flaky | total | result | +------------------+--------+--------+---------+-------+-------+--------+ | Plan | 310 | 0 | 2 | 0 | 312 | ✅ | | Package | 144 | 0 | 38 | 0 | 182 | ✅ | | Create | 542 | 4 | 90 | 0 | 636 | ❌ | | Data Stores | 150 | 1 | 3 | 0 | 154 | ❌ | | Govern | 189 | 0 | 0 | 0 | 189 | ✅ | | Fulfillment | 10 | 0 | 100 | 0 | 110 | ✅ | | Configure | 1 | 0 | 12 | 0 | 13 | ✅ | | Verify | 212 | 0 | 16 | 0 | 228 | ✅ | | Framework sanity | 0 | 0 | 6 | 0 | 6 | ➖ | | Manage | 191 | 0 | 10 | 0 | 201 | ✅ | | Release | 24 | 0 | 0 | 0 | 24 | ✅ | | Monitor | 44 | 0 | 9 | 0 | 53 | ✅ | | Systems | 2 | 0 | 0 | 0 | 2 | ✅ | | Analytics | 9 | 0 | 0 | 0 | 9 | ✅ | | ModelOps | 0 | 0 | 4 | 0 | 4 | ➖ | | Secure | 8 | 0 | 36 | 0 | 44 | ✅ | | GitLab Metrics | 2 | 0 | 1 | 0 | 3 | ✅ | | Growth | 0 | 0 | 8 | 0 | 8 | ➖ | +------------------+--------+--------+---------+-------+-------+--------+ | Total | 1838 | 5 | 335 | 0 | 2178 | ❌ | +------------------+--------+--------+---------+-------+-------+--------+
- Resolved by Heinrich Lee Yu
@minahilnichols can you please do the initial review?
requested review from @minahilnichols
requested review from @cablett
@minahilnichols
, thanks for approving this merge request.This is the first time the merge request is approved. To ensure full test coverage, a new pipeline will be started shortly.
For more info, please refer to the following links:
added pipeline:mr-approved label
removed review request for @minahilnichols
requested review from @engwan
removed review request for @cablett
enabled an automatic merge when the pipeline for 8cfcf306 succeeds
mentioned in merge request !119502 (merged)
- Resolved by Lin Jen-Shin
Hey @nmilojevic1,
We noticed that the review-app deployed in
review-deploy
was failing (e.g. https://gitlab.com/gitlab-org/gitlab/-/jobs/4258737589). We set review-apps deployments toallow_to_fail
a while ago. It's the reason why this MR can be merged.Coincidentally, and actually not because of this MR, we introduced !119502 (merged) to help catch web server issues earlier on in the pipeline (and in a failing job).
I would suggest not merging this MR right away, as I believe it would break other pipelines later on (I cancelled the MWPS @engwan for the time being to be safe).
EDIT:
Here's the error from the GCP logs:
ERROR 2023-05-11T10:12:25.876099030Z [resource.labels.containerName: webservice] /srv/gitlab/config/puma.rb:70:in `require_relative': cannot load such file -- /srv/gitlab/lib/gitlab/cluster/puma_worker_killer_initializer (LoadError) ERROR 2023-05-11T10:12:25.876146805Z [resource.labels.containerName: webservice] from /srv/gitlab/config/puma.rb:70:in `_load_from' ERROR 2023-05-11T10:12:25.876153434Z [resource.labels.containerName: webservice] from /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/puma-5.6.5/lib/puma/dsl.rb:87:in `instance_eval' ERROR 2023-05-11T10:12:25.876160241Z [resource.labels.containerName: webservice] from /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/puma-5.6.5/lib/puma/dsl.rb:87:in `_load_from' ERROR 2023-05-11T10:12:25.876165925Z [resource.labels.containerName: webservice] from /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/puma-5.6.5/lib/puma/configuration.rb:219:in `block in load' ERROR 2023-05-11T10:12:25.876169957Z [resource.labels.containerName: webservice] from /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/puma-5.6.5/lib/puma/configuration.rb:219:in `each' ERROR 2023-05-11T10:12:25.876174285Z [resource.labels.containerName: webservice] from /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/puma-5.6.5/lib/puma/configuration.rb:219:in `load' ERROR 2023-05-11T10:12:25.876178072Z [resource.labels.containerName: webservice] from /srv/gitlab/vendor/bundle/ruby/3.0.0/gems/puma-5.6.5/lib/puma/launcher.rb:60:in `initialize'
Edited by David Dieulivol
mentioned in merge request gitlab-org/build/CNG!1395 (merged)
mentioned in merge request !120608 (merged)
removed review request for @engwan
requested review from @ddieulivol
requested review from @godfat-gitlab and removed review request for @ddieulivol
enabled an automatic merge when the pipeline for 0b46a07e succeeds
mentioned in commit 3d0dbad6
added workflowstaging-canary label and removed workflowready for development label
added workflowcanary label and removed workflowstaging-canary label
added workflowstaging label and removed workflowcanary label
added workflowproduction label and removed workflowstaging label
added workflowpost-deploy-db-staging label and removed workflowproduction label
added releasedcandidate label
mentioned in merge request kubitus-project/kubitus-installer!2224 (merged)
Interesting that this isn't in the 16.0 stable branch
https://gitlab.com/gitlab-org/gitlab/-/blob/16-0-stable-ee/config/puma.rb.example
I arrived here after a Community contribution to document this change in the upgrade notes !125314 (merged).
mentioned in merge request !126717 (merged)
mentioned in issue #472928 (closed)