[18.8 Backport] Fix statement timeouts on p_ci_job_artifacts during pipeline deletion
What does this MR do and why?
Backport of !225515 (merged) (original fix) and !227837 (merged) (feature flag removal) to 18-8-stable-ee.
This fixes statement timeouts when deleting pipelines with many builds/job artifacts by using two-level batching (builds → artifacts) in Ci::Pipelines::DestroyAssociationsService instead of the problematic has_many :through JOIN query.
Cherry-picks both the original fix and the feature flag cleanup so that two-level batching is the default and only code path (no feature flag check).
Note: There was a minor conflict in app/models/ci/pipeline.rb around the private keyword placement, which was resolved cleanly.
References
- Feature issue: #582836 (closed)
- Rollout issue: #593102 (closed)
- Original fix MR: !225515 (merged)
- FF cleanup MR: !227837 (merged)
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
- This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
- The MR that fixed the bug on the default branch has been deployed to GitLab.com (not applicable for documentation or spec changes).
- The MR title is descriptive (e.g. "Backport of 'title of default branch MR'"). This is important, since the title will be copied to the patch blog post.
-
Required labels have been applied to this merge request
- severity label and bug subtype labels (if applicable)
- If this MR fixes a bug that affects customers, the customer label has been applied.
- This MR has been approved by a maintainer (only one approval is required).
-
Ensure the
e2e:test-on-omnibus-eejob has succeeded, or if it has failed, investigate the failures. If you determine the failures are unrelated, you may proceed. If you need assistance investigating, reach out to a Software Engineer in Test in #s_developer_experience.
Note to the merge request author and maintainer
If you have questions about the patch release process, please:
- Refer to the patch release runbook for engineers and maintainers for guidance.
- Ask questions on the
#releasesSlack channel (internal only). - Once the backport has been merged, the commit changes will be automatically deployed to a release environment that can be used for manual validation. See after merging runbook for details.