Skip to content

Wrap auto merge parameters update in database transaction

Shinya Maeda requested to merge curd-auto-merge-in-transaction into master

What does this MR do?

As @cat reported in #217908 (comment 352572239), when statement timeout happens on inserting comment in MR, it prevents processing MRs on trains as prematured MRs could be added to a train.

Quoting #217908 (comment 352575414),

This theory totally makes sense. We should handle the merge train gracefully regardless of the infra issue.

Related #217908 (closed)

Screenshots

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by Shinya Maeda

Merge request reports