1 files changed, 5 insertions, 0 deletions
diff --git a/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb b/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb
index e9c9f050982..39b98a0109f 100644
--- a/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb
+++ b/vendor/gems/sidekiq-reliable-fetch/lib/sidekiq/base_reliable_fetch.rb
@@ -57,6 +57,11 @@ module Sidekiq
 
       Sidekiq.logger.info('GitLab reliable fetch activated!')
 
+      # Set the heartbeat immediately to prevent a race condition where
+      # worker_dead? returns true in another thread. `start_heartbeat_thread`
+      # isn't guaranteed to have run before Sidekiq attempts to fetch jobs.
+      heartbeat
+
       start_heartbeat_thread
     end