Skip to content

Fix MailRoom not loading in Omnibus

Stan Hu requested to merge sh-fix-mailroom-startup-17-1 into 17-1-stable-ee

What does this MR do and why?

This backports !157339 (merged) to 17-1-stable-ee.

!155546 (merged) introduced Gitlab::Redis::ConfigGenerator. Omnibus has a tight coupling with the Rails code because:

  1. It loads config/mail_room.yml, which is actually an ERB file.
  2. This then loads lib/gitlab/mail_room, which requires code inside lib/gitlab/redis.

However, since MailRoom doesn't start Rails, startup can fail if not all the required modules are loaded.

As a short-term fix, load redis/config_generator to fix this issue.

Relates to #468467 (closed)

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).
  • This MR has a severity label assigned (if applicable).
  • Set the milestone of the merge request to match the target backport branch version.
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

If you have questions about the patch release process, please:

Edited by Stan Hu

Merge request reports