[15.10] Add SMTP timeout configuration options
Compare changes
Files
3@@ -506,6 +506,8 @@ default['gitlab']['gitlab-rails']['smtp_pool'] = false
This backports !6874 (merged) to 15-10-stable
.
In https://github.com/mikel/mail/pull/1427/files, mail v2.8.1 gem
modified the default open and read timeout values to 5 seconds instead
of the default Net::SMTP
30 and 60 seconds, respectively.
Since upgrading to GitLab 15.10.3, some users have observed receiving
Net::ReadTimeout
errors. This commit restores the original defaults
and allows users to configure the timeouts.
Relates to gitlab#410336 (closed)
See Definition of done.
For anything in this list which will not be completed, please provide a reason in the MR discussion.
If you don't have access to this, the reviewer should trigger these jobs for you during the review process.
Trigger:ee-package
jobs have a green pipeline running against latest commit.config/software
or config/patches
directories are changed, make sure the build-package-on-all-os
job within the Trigger:ee-package
downstream pipeline succeeded.Trigger:package:fips
manual job within the Trigger:ee-package
downstream pipeline must succeed.dev.gitlab.org
to confirm regular branch builds aren't broken.10
, duration 10s
, URI scheme://user:passwd@host:port
may require quotation or other special handling when rendered in a template and written to a configuration file.