Merge pull request #274 from Shopify/cbruckmayer/check-master

Return true if queue is initialized
Shopify · Apr 29, 2024 · 2da7c87 · 2da7c87
2 parents 2e2bf4f + eacc06a
commit 2da7c87
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ruby/lib/ci/queue/redis/base.rb b/ruby/lib/ci/queue/redis/base.rb
@@ -139,13 +139,16 @@ def progress
 
         def wait_for_master(timeout: 30)
           return true if master?
+          return true if queue_initialized?
+
           (timeout * 10 + 1).to_i.times do
             if queue_initialized?
               return true
             else
               sleep 0.1
             end
           end
+
           raise LostMaster, "The master worker is still `#{master_status}` after #{timeout} seconds waiting."
         end