rocketjob 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6cc91f7e665fcbe24f0ff2fd388540e5dc04274
-  data.tar.gz: 2c7277a7216c799d0ad59c645a5d3100079bf8f9
+  metadata.gz: 61ffcbdf9443ca63dc699d732c9cc5c228b3505a
+  data.tar.gz: cbecb1f0d5df94328fa4190847aa8422211294a4
 SHA512:
-  metadata.gz: 69f216ca8f7b62df4fd72bae9f8ef5d4bfbdcff166df82ae494ca8986cd9cc0360e5fb1886334697a5144c3c70b34ce054e36ac0ccde66aa009aab6e71a5a727
-  data.tar.gz: c600c821b1c881c428930f4f9e9133413205ce87811cd001d3b0ceba8c27455bc131d3d7695582f3e1a802872646f1a34c985297847f55a9ecb2495d93a1bec4
+  metadata.gz: 5e6de043e3a10b052855dfc5db392501bfad718242eecd1ef78110400e94d9fd571a88928877d613da0d520dbb984ed59cf61c66df18ce041fc85cd4028f135a
+  data.tar.gz: b1c2c436df6ceb73176a7cb65a343ab0a3c4b682099043270a8cc9409b79e272e029d2bc1b27b8e987629976030b929c3b3863bdf8a751e488c826d3ff5ec1c5

data/lib/rocket_job/plugins/job/throttle.rb

@@ -8,7 +8,7 @@ module RocketJob
       # Example:
       #   class MyJob < RocketJob
       #     # Maximum number of workers to process instances of this job at the same time.
-      #     self.throttle_max_workers = 25
+      #     self.throttle_running_jobs = 25
       #
       #     def perform
       #       # ....
@@ -23,7 +23,7 @@ module RocketJob
       # - If throughput is not as important as preventing brief spikes when many
       #   workers are running, add a double check into the perform:
       #     class MyJob < RocketJob
-      #       self.throttle_max_workers = 25
+      #       self.throttle_running_jobs = 25
       #
       #       def perform
       #         # (Optional) Prevent a brief spike from exceeding the wax worker throttle
@@ -36,8 +36,8 @@ module RocketJob
         extend ActiveSupport::Concern
 
         included do
-          class_attribute :throttle_max_workers
-          self.throttle_max_workers = nil
+          class_attribute :throttle_running_jobs
+          self.throttle_running_jobs = nil
         end
 
         # Throttle to add when the throttle is exceeded
@@ -47,7 +47,7 @@ module RocketJob
 
         # Returns [Boolean] whether the throttle for this job has been exceeded
         def throttle_exceeded?
-          throttle_max_workers && (throttle_max_workers != 0) ? (self.class.running.count >= throttle_max_workers) : false
+          throttle_running_jobs && (throttle_running_jobs != 0) ? (self.class.running.where(:id.ne => id).count >= throttle_running_jobs) : false
         end
 
         # Prevent a brief spike from exceeding the wax worker throttle
@@ -57,8 +57,6 @@ module RocketJob
           end
         end
 
-        private
-
         # Merge filter(s)
         def throttle_merge_filter(target, source)
           source.each_pair do |k, v|
@@ -69,6 +67,7 @@ module RocketJob
                 v
               end
           end
+          target
         end
 
       end

data/lib/rocket_job/plugins/job/worker.rb

@@ -57,8 +57,9 @@ module RocketJob
                 job.rocket_job_fail_on_exception!(worker_name) { job.destroy }
                 logger.info "Destroyed expired job #{job.class.name}, id:#{job.id}"
               when job.throttle_exceeded?
+                logger.debug { "Throttle exceeded with job #{job.class.name}, id:#{job.id}" }
                 # Add jobs filter to the current filter
-                throttle_merge_filter(filter, job.throttle_filter)
+                job.throttle_merge_filter(filter, job.throttle_filter)
                 # Restore retrieved job so that other workers can process it later
                 job.set(worker_name: nil, state: :queued)
               else

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob #:nodoc
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/test/plugins/job/throttle_test.rb

@@ -7,16 +7,16 @@ module Plugins
 
       class ThrottleJob < RocketJob::Job
         # Only allow one to be processed at a time
-        self.throttle_max_workers = 1
+        self.throttle_running_jobs = 1
 
         def perform
           21
         end
       end
 
-      describe RocketJob::Plugins::Job::Logger do
+      describe RocketJob::Plugins::Job::Throttle do
         before do
-          ThrottleJob.delete_all
+          RocketJob::Job.delete_all
         end
 
         describe '#throttle_exceeded?' do
@@ -50,6 +50,45 @@ module Plugins
           end
         end
 
+        describe '.rocket_job_next_job' do
+          before do
+            @worker_name = 'worker:123'
+          end
+
+          after do
+            @job.destroy if @job && !@job.new_record?
+          end
+
+          it 'return nil when no jobs available' do
+            assert_nil RocketJob::Job.rocket_job_next_job(@worker_name)
+          end
+
+          it 'return the job when others are queued, paused, failed, or complete' do
+            @job = ThrottleJob.create!
+            ThrottleJob.create!(state: :failed)
+            ThrottleJob.create!(state: :complete)
+            ThrottleJob.create!(state: :paused)
+            assert job = RocketJob::Job.rocket_job_next_job(@worker_name), -> { ThrottleJob.all.to_a.ai }
+            assert_equal @job.id, job.id, -> { ThrottleJob.all.to_a.ai }
+          end
+
+          it 'return nil when other jobs are running' do
+            ThrottleJob.create!
+            @job = ThrottleJob.new
+            @job.start!
+            assert_nil RocketJob::Job.rocket_job_next_job(@worker_name), -> { ThrottleJob.all.to_a.ai }
+          end
+
+          it 'add job to filter when other jobs are running' do
+            ThrottleJob.create!
+            @job = ThrottleJob.new
+            @job.start!
+            filter = {}
+            assert_nil RocketJob::Job.rocket_job_next_job(@worker_name, filter), -> { ThrottleJob.all.to_a.ai }
+            assert_equal 1, filter.size
+          end
+        end
+
       end
     end
   end

data/test/plugins/job/worker_test.rb

@@ -43,30 +43,30 @@ module Plugins
 
         describe '.rocket_job_next_job' do
           before do
-            @job    = QuietJob.new
-            @worker = RocketJob::Server.new(name: 'worker:123')
+            @job         = QuietJob.new
+            @worker_name = 'worker:123'
           end
 
           it 'return nil when no jobs available' do
-            assert_nil RocketJob::Job.rocket_job_next_job(@worker.name)
+            assert_nil RocketJob::Job.rocket_job_next_job(@worker_name)
           end
 
           it 'return the first job' do
             @job.save!
-            assert job = RocketJob::Job.rocket_job_next_job(@worker.name), 'Failed to find job'
+            assert job = RocketJob::Job.rocket_job_next_job(@worker_name), 'Failed to find job'
             assert_equal @job.id, job.id
           end
 
           it 'Ignore future dated jobs' do
             @job.run_at = Time.now + 1.hour
             @job.save!
-            assert_nil RocketJob::Job.rocket_job_next_job(@worker.name)
+            assert_nil RocketJob::Job.rocket_job_next_job(@worker_name)
           end
 
           it 'Process future dated jobs when time is now' do
             @job.run_at = Time.now
             @job.save!
-            assert job = RocketJob::Job.rocket_job_next_job(@worker.name), 'Failed to find future job'
+            assert job = RocketJob::Job.rocket_job_next_job(@worker_name), 'Failed to find future job'
             assert_equal @job.id, job.id
           end
 
@@ -74,7 +74,7 @@ module Plugins
             count           = RocketJob::Job.count
             @job.expires_at = Time.now - 100
             @job.save!
-            assert_nil RocketJob::Job.rocket_job_next_job(@worker.name)
+            assert_nil RocketJob::Job.rocket_job_next_job(@worker_name)
             assert_equal count, RocketJob::Job.count
           end
         end
@@ -173,8 +173,8 @@ module Plugins
 
         describe '#rocket_job_active_workers' do
           before do
-            @job    = QuietJob.create!
-            @worker = RocketJob::Server.create!(name: 'worker:123')
+            @job         = QuietJob.create!
+            @worker_name = 'worker:123'
           end
 
           it 'should return empty hash for no active jobs' do
@@ -182,12 +182,12 @@ module Plugins
           end
 
           it 'should return active servers' do
-            assert job = RocketJob::Job.rocket_job_next_job(@worker.name)
+            assert job = RocketJob::Job.rocket_job_next_job(@worker_name)
             assert active = job.rocket_job_active_workers
             assert_equal 1, active.size
             assert active_worker = active.first
             assert_equal @job.id, active_worker.job.id
-            assert_equal @worker.name, active_worker.name
+            assert_equal @worker_name, active_worker.name
             assert_equal job.started_at, active_worker.started_at
             assert active_worker.duration_s
             assert active_worker.duration

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby