ci-queue 0.57.0 → 0.58.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7d14c6d18d859390f4213fd8d9c6d0a94578439ae8d8ca499584d382992bca8
-  data.tar.gz: 433999764455024fe84cf5758434a706415e612afe1a2460a1235fb3fc5e41d3
+  metadata.gz: 0302564aa747e3b115328f8e8a09ba89e319631c885eb6250236a4f53d5d4b3f
+  data.tar.gz: c09e4e48c6fcded24e23673d39beb5374960e95ac47a1f74805dce6e868c1ae8
 SHA512:
-  metadata.gz: ed7e6c1547cbf90a00b3b80e8229dc13ba8803453de9d6af291a51add17023ddf1745c0a96ff424737e08d6bffd6cbd51e5c9e60c3acfb0263d01c03c60083a7
-  data.tar.gz: 5519db14c36093f0f4c0b5109764c3a4029f411a4b73436047ebae9fd1be7c0559ceea48a7f48cf8de4ea372ab0c3a0269cb250f05aeff28f501f252aeddc379
+  metadata.gz: d885b7fd5fbaaefb1fb3271a5364285b0b4a16a2e58449beae1e9f1a8e430f9e48554f7e707299124b4ae132e0122679b8a2c1163f4d22e2707a03fdba3f09b4
+  data.tar.gz: daa111f58048ce32e754698858305ed48d68f35e4d60a023b5263674d3151386cb395a36e1a40b6926ae874b1b4187567b9937632deedc77a474b63d34c5f9b2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.57.0)
+    ci-queue (0.58.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/ci/queue/redis/base.rb

@@ -13,16 +13,18 @@ module CI
 
         module RedisInstrumentation
           def call(command, redis_config)
-            result = super
             logger = redis_config.custom[:debug_log]
-            logger.info("#{command}: #{result}")
+            logger.info("Running '#{command}'")
+            result = super
+            logger.info("Finished '#{command}': #{result}")
             result
           end
 
           def call_pipelined(commands, redis_config)
-            result = super
             logger = redis_config.custom[:debug_log]
-            logger.info("#{commands}: #{result}")
+            logger.info("Running '#{commands}'")
+            result = super
+            logger.info("Finished '#{commands}': #{result}")
             result
           end
         end
@@ -185,6 +187,20 @@ module CI
 
         attr_reader :redis, :redis_url
 
+        def with_redis_timeout(timeout)
+          prev = redis._client.timeout
+          redis._client.timeout = timeout
+          yield
+        ensure
+          redis._client.timeout = prev
+        end
+
+        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

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

@@ -47,12 +47,6 @@ module CI
 
         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

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

@@ -204,15 +204,35 @@ module CI
           @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."
+            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
             end
+
+            puts "Finished pushing #{@total} tests to the queue in #{duration.round(2)}s."
           end
           register
           redis.expire(key('workers'), config.redis_ttl)

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.57.0'
+    VERSION = '0.58.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/runner.rb

@@ -223,7 +223,7 @@ module Minitest
 
         failing_order = queue.candidates
         step("Final validation")
-        status = if run_tests_in_fork(failing_order)
+        if run_tests_in_fork(failing_order)
           step(yellow("The bisection was inconclusive, there might not be any leaky test here."))
           File.write('log/test_order.log', "")
           exit! 1
@@ -314,7 +314,8 @@ module Minitest
       private
 
       attr_reader :queue_config, :options, :command, :argv
-      attr_accessor :queue, :queue_url, :grind_list, :grind_count, :load_paths, :verbose
+      attr_writer :queue_url
+      attr_accessor :queue, :grind_list, :grind_count, :load_paths, :verbose
 
       def require_worker_id!
         if queue.distributed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.57.0
+  version: 0.58.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -242,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.20
 signing_key:
 specification_version: 4
 summary: Distribute tests over many workers using a queue