Merge pull request #38 from figma/ck/fix-broken-code

Fix code broken from the merge with michaelnyu/ci-queue

Author: ckilpatrick-stay-hydrated-call-your-mom

.github/workflows/cla.yml

@@ -26,10 +26,17 @@ def wait_for_workers
 
           time_left = config.report_timeout - duration.to_i
           time_left_with_no_workers = config.inactive_workers_timeout
+          last_heartbeat_time = Time.now
           until exhausted? || time_left <= 0 || max_test_failed? || time_left_with_no_workers <= 0
             time_left -= 1
             sleep 1
 
+            # Heartbeat log every 5 minutes
+            if Time.now - last_heartbeat_time > 300
+              puts '[ci-queue] Still working'
+              last_heartbeat_time = Time.now
+            end
+
             if active_workers?
               time_left_with_no_workers = config.inactive_workers_timeout
             else

ruby/lib/ci/queue/redis/supervisor.rb

@@ -48,16 +48,10 @@ def master?
 
         def poll
           wait_for_master
-          last_heartbeat_time = Time.now
           until shutdown_required? || config.circuit_breakers.any?(&:open?) || exhausted? || max_test_failed?
             if test = reserve
               yield index.fetch(test)
             else
-              # Log heartbeat every 5 minutes if this is the master process
-              if master? && Time.now - last_heartbeat_time > 300
-                puts '[ci-queue] Still working'
-                last_heartbeat_time = Time.now
-              end
               sleep 0.05
             end
           end
@@ -209,34 +203,15 @@ def push(tests)
 
           if @master = redis.setnx(key('master-status'), 'setup')
             puts "Worker electected as leader, pushing #{@total} tests to the queue."
-            puts
-
-            attempts = 0
-            duration = measure do
-              with_redis_timeout(5) do
-                redis.without_reconnect do
-                  redis.multi do |transaction|
-                    transaction.lpush(key('queue'), tests) unless tests.empty?
-                    transaction.set(key('total'), @total)
-                    transaction.set(key('master-status'), 'ready')
-
-                    transaction.expire(key('queue'), config.redis_ttl)
-                    transaction.expire(key('total'), config.redis_ttl)
-                    transaction.expire(key('master-status'), config.redis_ttl)
-                  end
-                end
-              rescue ::Redis::BaseError => error
-                if !queue_initialized? && attempts < 3
-                  puts "Retrying pushing #{@total} tests to the queue... (#{error})"
-                  attempts += 1
-                  retry
-                end
-
-                raise if !queue_initialized?
-              end
+            redis.multi do |transaction|
+              transaction.lpush(key('queue'), tests) unless tests.empty?
+              transaction.set(key('total'), @total)
+              transaction.set(key('master-status'), 'ready')
+
+              transaction.expire(key('queue'), config.redis_ttl)
+              transaction.expire(key('total'), config.redis_ttl)
+              transaction.expire(key('master-status'), config.redis_ttl)
             end
-
-            puts "Finished pushing #{@total} tests to the queue in #{duration.round(2)}s."
           end
           register
           redis.expire(key('workers'), config.redis_ttl)

ruby/lib/ci/queue/redis/worker.rb

@@ -266,7 +266,7 @@ def run_from_queue(reporter, *)
       reopen_previous_step
       puts red("The heartbeat process died. This worker is exiting early.")
       exit!(41)
-    rescue CI::Queue::Error
+    rescue CI::Queue::Error => error
       reopen_previous_step
       puts red("#{error.class}: #{error.message}")
       error.backtrace.each do |frame|