Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 0 deletions

diff --git a/config/initializers/7_prometheus_metrics.rb b/config/initializers/7_prometheus_metrics.rb
index c5cd055f4ff..d58fb54f71c 100644
--- a/config/initializers/7_prometheus_metrics.rb
+++ b/config/initializers/7_prometheus_metrics.rb
@@ -34,6 +34,12 @@ Sidekiq.configure_server do |config|
   config.on(:startup) do
     # webserver metrics are cleaned up in config.ru: `warmup` block
     Prometheus::CleanupMultiprocDirService.new.execute
+    # In production, sidekiq is run in a multi-process setup where processes might interfere
+    # with each other cleaning up and reinitializing prometheus database files, which is why
+    # we're re-doing the work every time here.
+    # A cleaner solution would be to run the cleanup pre-fork, and the initialization once
+    # after all workers have forked, but I don't know how at this point.
+    ::Prometheus::Client.reinitialize_on_pid_change(force: true)
 
     Gitlab::Metrics::Exporter::SidekiqExporter.instance.start
   end