ci-queue 0.44.0 → 0.46.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d358486ed352600dfd7852ac73bb78eadb6b1a16590ff9b8a325cac8d6d7eecc
-  data.tar.gz: 616effbd0c5f6e838a0213d73e9ea3e5ad874c617c7dd5af37150476dc057369
+  metadata.gz: ea479767ef84b35f96de1e28bd5e4a79027bb90e7a6d06c101056f6486a63e8b
+  data.tar.gz: c932bac995769751c422790553a063685f4690aa5f7ceffb07ce04174e88bfe2
 SHA512:
-  metadata.gz: 024057c3cd9e5c3448e6378013d46edd86898f40a582c07736f204aa93d6c233715ff784ecb8c5f9e4917c6267d827dc12e9455e071af0198a377d33c932913b
-  data.tar.gz: 84bea6fbdb4e8a54ced3a7d42c7a6fe963dd2d1b20cc0281d87d78332944af126275e9200d073de5d6e4caa9b20d787b7afc870315a739b9af0ef921e69a5586
+  metadata.gz: bf13fd4ee60aeff7024e2af393986b19315b0b006a233b00c6468758ada80242344c405b0954bd0ecd3b17f9511048b3fe49049ac342d2b9f3743963348c84f9
+  data.tar.gz: f0e9933fd3ccff6fb536717cd249cad212d53deaa4c72681fe36ea54247f015c8c9b960870f8b9fd3a1f318e103ae67aeb380c8151c1a3ea121ed7ec49a96b47

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

@@ -118,6 +118,14 @@ module CI
           end.inject(:+)
         end
 
+        def remaining
+          redis.llen(key('queue'))
+        end
+
+        def running
+          redis.zcard(key('running'))
+        end
+
         def to_a
           redis.multi do |transaction|
             transaction.lrange(key('queue'), 0, -1)

data/lib/ci/queue/static.rb

@@ -63,7 +63,7 @@ module CI
       end
 
       def expired?
-        (@created_at.to_f TEN_MINUTES) < CI::Queue.time_now.to_f
+        (@created_at.to_f + TEN_MINUTES) < CI::Queue.time_now.to_f
       end
 
       def populated?
@@ -78,10 +78,19 @@ module CI
         @queue.size
       end
 
+      def remaining
+        @queue.size
+      end
+
+      def running
+        @reserved_test ? 1 : 0
+      end
+
       def poll
-        while !@shutdown && config.circuit_breakers.none?(&:open?) && !max_test_failed? && test = @queue.shift
-          yield index.fetch(test)
+        while !@shutdown && config.circuit_breakers.none?(&:open?) && !max_test_failed? && @reserved_test = @queue.shift
+          yield index.fetch(@reserved_test)
         end
+        @reserved_test = nil
       end
 
       def exhausted?

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/runner.rb

@@ -86,8 +86,23 @@ module Minitest
         if queue.rescue_connection_errors { queue.exhausted? }
           puts green('All tests were ran already')
         else
-          load_tests
-          populate_queue
+          # If the job gets (automatically) retried and there are still workers running but not many tests left
+          # in the queue, we assume by the time the application is booted the queue is empty and it's faster to no-op.
+          if retry?
+            remaining = queue.rescue_connection_errors { queue.remaining }.to_i
+            running = queue.rescue_connection_errors { queue.running }.to_i
+
+            puts "#{remaining} tests left and #{running} workers running."
+            if remaining <= running
+              puts green("Queue almost empty, exiting early...")
+            else
+              load_tests
+              populate_queue
+            end
+          else
+            load_tests
+            populate_queue
+          end
         end
 
         at_exit {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.46.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-30 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler