hirefire-resource 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c33c7654d2bec9a8f5a0325c508fcf1314555f1409f693808189057558a71f
-  data.tar.gz: dc51a264bac728b99397178bbf741d7b61589d57d9cdf6fb40ade130bdf51b22
+  metadata.gz: 3707ebd2fc7528f274027a9089e6c9a68f8371f23ddcf83bb367ebe594972667
+  data.tar.gz: ec772d13937e655834c9863380c8c651a9d2847a0598841c6763b61b21cc2568
 SHA512:
-  metadata.gz: 10103ce68c4fb42249f533cc89b824a8ec200c4fb04ebfb059f3949cae0b7dda53eb2005d8c763dab431619be794fd9307847d4b57909c16d8bf0ba775378cb3
-  data.tar.gz: edaee01b36999e985f8f2858f81c99f89d119705b0e4a840190bb2d70cd282b4d86874501373992aabee7ca02534949fb6fa193cde119c5151d1d8b047a5b720
+  metadata.gz: 59e4930d3819da8e2c3f6e5903e12683a2eba0c4514f07ab0eb9ed65f80d0a71ebf6f2949e1445ca5b6165c477a4e0aa87e2c994f21afe37bddfbe69e1cde76f
+  data.tar.gz: f7f1395eb1d880ec10a5344c409216017156d2ae977157968fe99de800ba594ae2621ed44173becf809b4872efbc256e175761d3c7147369d05630a2fd90dddf

data/hirefire-resource.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = "hirefire-resource"
-  gem.version = "0.5.0"
+  gem.version = "0.6.0"
   gem.platform = Gem::Platform::RUBY
   gem.authors = "Michael van Rooijen"
   gem.email = "michael@hirefire.io"

data/lib/hirefire/macro/sidekiq.rb

@@ -28,9 +28,44 @@ module HireFire
           options = {}
         end
 
-        queues = queues.map(&:to_s)
-        queues = ::Sidekiq::Stats.new.queues.map { |name, _| name } if queues.empty?
+        queues.map!(&:to_s)
+        all_queues = ::Sidekiq::Queue.all.map(&:name)
+        queues = all_queues if queues.empty?
 
+        if fast_lookup_capable?(queues, all_queues)
+          fast_lookup(options)
+        else
+          dynamic_lookup(queues, options)
+        end
+      end
+
+      private
+
+      def fast_lookup_capable?(queues, all_queues)
+        # When no queue names are provided (or all of them are), we know we
+        # can peform much faster counts using Sidekiq::Stats and Redis
+        queues.sort == all_queues.sort
+      end
+
+      def fast_lookup(options)
+        stats = ::Sidekiq::Stats.new
+
+        in_queues = stats.enqueued
+
+        if !options[:skip_scheduled]
+          in_schedule = ::Sidekiq.redis { |c| c.zcount('schedule', '-inf', Time.now.to_f) }
+        end
+
+        if !options[:skip_retries]
+          in_retry = ::Sidekiq.redis { |c| c.zcount('retry', '-inf', Time.now.to_f) }
+        end
+
+        in_progress = stats.workers_size
+
+        [in_queues, in_schedule, in_retry, in_progress].compact.inject(&:+)
+      end
+
+      def dynamic_lookup(queues, options)
         in_queues = queues.inject(0) do |memo, name|
           memo += ::Sidekiq::Queue.new(name).size
           memo
@@ -38,25 +73,34 @@ module HireFire
 
         if !options[:skip_scheduled]
           max = options[:max_scheduled]
+
+          # For potentially long-running loops, compare all jobs against
+          # time when the set snapshot was taken to avoid incorrect counts.
+          now = Time.now
+
           in_schedule = ::Sidekiq::ScheduledSet.new.inject(0) do |memo, job|
-            memo += 1 if queues.include?(job["queue"]) && job.at <= Time.now
+            memo += 1 if queues.include?(job["queue"]) && job.at <= now
             break memo if max && memo >= max
             memo
           end
         end
 
         if !options[:skip_retries]
+          now = Time.now
+
           in_retry = ::Sidekiq::RetrySet.new.inject(0) do |memo, job|
-            memo += 1 if queues.include?(job["queue"]) && job.at <= Time.now
+            memo += 1 if queues.include?(job["queue"]) && job.at <= now
             memo
           end
         end
 
-        i = ::Sidekiq::VERSION >= "3.0.0" ? 2 : 1
-        in_progress = ::Sidekiq::Workers.new.inject(0) do |memo, job|
-          memo += 1 if queues.include?(job[i]["queue"]) && job[i]["run_at"] <= Time.now.to_i
-          memo
-        end
+        now = Time.now.to_i
+
+        # Objects yielded to Workers#each:
+        # https://github.com/mperham/sidekiq/blob/305ab8eedc362325da2e218b2a0e20e510668a42/lib/sidekiq/api.rb#L912
+        in_progress = ::Sidekiq::Workers.new.select do |key, tid, job|
+          queues.include?(job['queue']) && job['run_at'] <= now
+        end.size
 
         [in_queues, in_schedule, in_retry, in_progress].compact.inject(&:+)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hirefire-resource
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Michael van Rooijen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-09-06 00:00:00.000000000 Z
 dependencies: []
 description: Load- and schedule-based scaling for web- and worker dynos
 email: michael@hirefire.io
@@ -57,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Autoscaling for your Heroku dynos