Add logs around leader election

Shopify · Jun 13, 2024 · 916a7cd · 916a7cd
1 parent 404ab99
commit 916a7cd
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 14 deletions.
diff --git a/ruby/lib/ci/queue/redis/base.rb b/ruby/lib/ci/queue/redis/base.rb
@@ -185,6 +185,12 @@ def max_test_failed?
 
         attr_reader :redis, :redis_url
 
+        def measure
+          starting = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          yield
+          Process.clock_gettime(Process::CLOCK_MONOTONIC) - starting
+        end
+
         def key(*args)
           ['build', build_id, *args].join(':')
         end

diff --git a/ruby/lib/ci/queue/redis/supervisor.rb b/ruby/lib/ci/queue/redis/supervisor.rb
@@ -47,12 +47,6 @@ def wait_for_workers
 
         private
 
-        def measure
-          starting = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-          yield
-          Process.clock_gettime(Process::CLOCK_MONOTONIC) - starting
-        end
-
         def active_workers?
           # if there are running jobs we assume there are still agents active
           redis.zrangebyscore(key('running'), CI::Queue.time_now.to_f - config.timeout, "+inf", limit: [0,1]).count > 0

diff --git a/ruby/lib/ci/queue/redis/worker.rb b/ruby/lib/ci/queue/redis/worker.rb
@@ -200,15 +200,21 @@ def push(tests)
           @total = tests.size
 
           if @master = redis.setnx(key('master-status'), 'setup')
-            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)
+            puts "Worker electected as leader, pushing #{@total} tests to the queue."
+
+            duration = measure 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
+
+            puts "Finished pushing #{@total} tests to the queue in #{duration} seconds."
           end
           register
           redis.expire(key('workers'), config.redis_ttl)