Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 5 deletions

diff --git a/sidekiq_cluster/cli.rb b/sidekiq_cluster/cli.rb
index 59f39003429..c0940370d3b 100644
--- a/sidekiq_cluster/cli.rb
+++ b/sidekiq_cluster/cli.rb
@@ -100,6 +100,11 @@ module Gitlab
 
         unless @dryrun
           @logger.info("Starting cluster with #{queue_groups.length} processes")
+
+          # Make sure we reset the metrics directory prior to:
+          # - starting a metrics server process
+          # - starting new workers
+          ::Prometheus::CleanupMultiprocDirService.new(@metrics_dir).execute
         end
 
         start_and_supervise_workers(queue_groups)
@@ -118,11 +123,6 @@ module Gitlab
 
         return if @dryrun
 
-        # Make sure we reset the metrics directory prior to:
-        # - starting a metrics server process
-        # - starting new workers
-        ::Prometheus::CleanupMultiprocDirService.new(@metrics_dir).execute
-
         ProcessManagement.write_pid(@pid) if @pid
 
         supervisor = SidekiqProcessSupervisor.instance(