Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 0 deletions

diff --git a/lib/gitlab/metrics/exporter/sidekiq_exporter.rb b/lib/gitlab/metrics/exporter/sidekiq_exporter.rb
index 4de95edfc18..5ba7b29734b 100644
--- a/lib/gitlab/metrics/exporter/sidekiq_exporter.rb
+++ b/lib/gitlab/metrics/exporter/sidekiq_exporter.rb
@@ -14,6 +14,29 @@ module Gitlab
         def log_filename
           File.join(Rails.root, 'log', 'sidekiq_exporter.log')
         end
+
+        private
+
+        # Sidekiq Exporter does not work properly in sidekiq-cluster
+        # mode. It tries to start the service on the same port for
+        # each of the cluster workers, this results in failure
+        # due to duplicate binding.
+        #
+        # For now we ignore this error, as metrics are still "kind of"
+        # valid as they are rendered from shared directory.
+        #
+        # Issue: https://gitlab.com/gitlab-org/gitlab/issues/5714
+        def start_working
+          super
+        rescue Errno::EADDRINUSE => e
+          Sidekiq.logger.error(
+            class: self.class.to_s,
+            message: 'Cannot start sidekiq_exporter',
+            exception: e.message
+          )
+
+          false
+        end
       end
     end
   end