rocketjob 5.2.0.beta1 → 5.2.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8920ff4a319e838729863bbf2a7a66a4ee003ac9328cc1c3d3942fc59cecab2c
-  data.tar.gz: 3c5f4927370915b3188295cd181f5b1dc4ae64a17b0cd070e946cfa82b7517c6
+  metadata.gz: be987bf17c7505ce19a06f0f15bd612b0d9588a7aed842250b4f094b98b026ef
+  data.tar.gz: afb3b94b5f47c4fd462da9732f6b94d87b53f96e9afe22f66592c89eeed3c521
 SHA512:
-  metadata.gz: 1395412d271a4a1cde3d1f80fa6d45d5a0e948454b34e6a1d1221631b718d1f4fb16e3683a4a57af1e1f64d724219b70ab65cd84f7a2c9658d67e0608d263973
-  data.tar.gz: f5b161cf5dcb32126dff42b645b3356707ea74623f011af9a6e7bf0b8fee6403254b302ec5644a85181c207dbe70cfa3a82349be4a2bf52127e68e9f4ebaf5ab
+  metadata.gz: 0f71a2a1aa604c1db1babf43ea5865724617515b7f0ea299e438d8fb4bb845d2a4ef21c4bbd5994034cb070c72c6b6f53dfbf45d2b52e576c8a2cb3202e1549a
+  data.tar.gz: 969bcffcb4aa38277b99f88188334e28393ed6fa92e5e470214879ec2d169e81a586947daaf3bcaea446ac8766e49e9c7dd328a4131bde0275808eff241a9437

data/lib/rocket_job/batch/throttle_running_workers.rb

@@ -53,6 +53,19 @@ module RocketJob
           conn.where(:id.ne => slice.id).count >= throttle_running_workers
         end
       end
+
+      # Returns [Boolean] whether the throttle for this job has been exceeded
+      #
+      # With a Batch job, allow a higher priority queued job to replace a running one with
+      # a lower priority.
+      def throttle_running_jobs_exceeded?
+        return unless throttle_running_jobs&.positive?
+
+        # Cannot use this class since it will include instances of parent job classes.
+        RocketJob::Job.with(read: {mode: :primary}) do |conn|
+          conn.running.where("_type" => self.class.name, :id.ne => id, :priority.lt => priority).count >= throttle_running_jobs
+        end
+      end
     end
   end
 end

data/lib/rocket_job/batch/worker.rb

@@ -129,7 +129,7 @@ module RocketJob
       # Process a single slice from Mongo
       # Once the slice has been successfully processed it will be removed from the input collection
       # Returns [Integer] the number of records successfully processed
-      def rocket_job_process_slice(slice)
+      def rocket_job_process_slice(slice, &block)
         # TODO: Skip records already processed
         @rocket_job_record_number = slice.first_record_number || 0
         @rocket_job_slice         = slice
@@ -142,7 +142,7 @@ module RocketJob
           RocketJob::Sliced::Writer::Output.collect(self, slice) do |writer|
             slice.each do |record|
               SemanticLogger.named_tagged(record: @rocket_job_record_number) do
-                writer << rocket_job_batch_perform(slice, record)
+                writer << rocket_job_batch_perform(slice, record, &block)
                 processed_records += 1
               end
               # JRuby thinks self.rocket_job_record_number= is private and cannot be accessed
@@ -202,7 +202,7 @@ module RocketJob
             unless new_record?
               # Fail job iff no other worker has already finished it
               # Must set write concern to at least 1 since we need the nModified back
-              result   = self.class.with(write: {w: 1}) do |query|
+              result = self.class.with(write: {w: 1}) do |query|
                 query.
                   where(id: id, state: :running, sub_state: :processing).
                   update({"$set" => {state: :failed, worker_name: worker_name}})

data/lib/rocket_job/sliced/slice.rb

@@ -128,9 +128,7 @@ module RocketJob
       # Returns the failed record.
       # Returns [nil] if there is no failed record
       def failed_record
-        if exception && processing_record_number
-          at(processing_record_number - 1)
-        end
+        at(processing_record_number - 1) if exception && processing_record_number
       end
 
       # Returns [Hash] the slice as a Hash for storage purposes

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = "5.2.0.beta1".freeze
+  VERSION = "5.2.0.beta2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.2.0.beta1
+  version: 5.2.0.beta2
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-05 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm