rocketjob 5.4.1 → 6.0.0.rc1

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

@@ -37,7 +37,7 @@ module RocketJob
 
         private
 
-        # Returns [Boolean] whether the throttle for this job has been exceeded
+        # Returns [true|false] whether the throttle for this job has been exceeded
         def throttle_running_jobs_exceeded?
           return false unless throttle_running_jobs&.positive?
 

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

@@ -48,11 +48,11 @@ module RocketJob
         def perform_now
           raise(::Mongoid::Errors::Validations, self) unless valid?
 
-          worker = RocketJob::Worker.new(inline: true)
+          worker = RocketJob::Worker.new
           start if may_start?
           # Re-Raise exceptions
           rocket_job_work(worker, true) if running?
-          result
+          @rocket_job_output
         end
 
         def perform(*)
@@ -106,11 +106,6 @@ module RocketJob
               end
             end
 
-            if collect_output?
-              # Result must be a Hash, if not put it in a Hash
-              self.result = @rocket_job_output.is_a?(Hash) ? @rocket_job_output : {"result" => @rocket_job_output}
-            end
-
             if new_record? || destroyed?
               complete if may_complete?
             else

data/lib/rocket_job/plugins/restart.rb

@@ -91,8 +91,16 @@ module RocketJob
           logger.info("Job has expired. Not creating a new instance.")
           return
         end
-        attributes = rocket_job_restart_attributes.each_with_object({}) { |attr, attrs| attrs[attr] = send(attr) }
-        rocket_job_restart_create(attributes)
+        job_attrs              =
+          rocket_job_restart_attributes.each_with_object({}) { |attr, attrs| attrs[attr] = send(attr) }
+        job                    = self.class.new(job_attrs)
+
+        # Copy across input and output categories to new scheduled job so that all of the
+        # settings are remembered between instance. Example: slice_size
+        job.input_categories  = input_categories if respond_to?(:input_categories)
+        job.output_categories = output_categories if respond_to?(:output_categories)
+
+        rocket_job_restart_save(job)
       end
 
       def rocket_job_restart_abort
@@ -101,11 +109,10 @@ module RocketJob
 
       # Allow Singleton to prevent the creation of a new job if one is already running
       # Retry since the delete may not have persisted to disk yet.
-      def rocket_job_restart_create(attrs, retry_limit = 3, sleep_interval = 0.1)
+      def rocket_job_restart_save(job, retry_limit = 10, sleep_interval = 0.5)
         count = 0
         while count < retry_limit
-          job = self.class.create(attrs)
-          if job.persisted?
+          if job.save
             logger.info("Created a new job instance: #{job.id}")
             return true
           else

data/lib/rocket_job/plugins/state_machine.rb

@@ -51,7 +51,8 @@ module RocketJob
               # Validate methods are any of Symbol String Proc
               methods.each do |method|
                 unless method.is_a?(Symbol) || method.is_a?(String)
-                  raise(ArgumentError, "#{action}_#{event_name} currently does not support any options. Only Symbol and String method names can be supplied.")
+                  raise(ArgumentError,
+                        "#{action}_#{event_name} currently does not support any options. Only Symbol and String method names can be supplied.")
                 end
               end
               methods

data/lib/rocket_job/ractor_worker.rb

@@ -0,0 +1,42 @@
+module RocketJob
+  # Run each worker in its own "Ractor".
+  class RactorWorker < Worker
+    attr_reader :thread
+
+    def initialize(id:, server_name:)
+      super(id: id, server_name: server_name)
+      @shutdown = Concurrent::Event.new
+      @thread   = Ractor.new(name: "rocketjob-#{id}") { run }
+    end
+
+    def alive?
+      @thread.alive?
+    end
+
+    def backtrace
+      @thread.backtrace
+    end
+
+    def join(*args)
+      @thread.join(*args)
+    end
+
+    # Send each active worker the RocketJob::ShutdownException so that stops processing immediately.
+    def kill
+      @thread.raise(Shutdown, "Shutdown due to kill request for worker: #{name}") if @thread.alive?
+    end
+
+    def shutdown?
+      @shutdown.set?
+    end
+
+    def shutdown!
+      @shutdown.set
+    end
+
+    # Returns [true|false] whether the shutdown indicator was set
+    def wait_for_shutdown?(timeout = nil)
+      @shutdown.wait(timeout)
+    end
+  end
+end

data/lib/rocket_job/server/model.rb

@@ -28,7 +28,7 @@ module RocketJob
 
         # Current state
         #   Internal use only. Do not set this field directly
-        field :state, type: Symbol, default: :starting
+        field :state, type: Mongoid::StringifiedSymbol, default: :starting
 
         index({name: 1}, background: true, unique: true)
 

data/lib/rocket_job/sliced.rb

@@ -14,78 +14,23 @@ module RocketJob
       autoload :Output, "rocket_job/sliced/writer/output"
     end
 
-    # Returns [RocketJob::Sliced::Slices] for the relevant type and category.
-    #
-    # Supports compress and encrypt with [true|false|Hash] values.
-    # When [Hash] they must specify whether the apply to the input or output collection types.
-    #
-    # Example, compress both input and output collections:
-    #   class MyJob < RocketJob::Job
-    #     include RocketJob::Batch
-    #     self.compress = true
-    #   end
-    #
-    # Example, compress just the output collections:
-    #   class MyJob < RocketJob::Job
-    #     include RocketJob::Batch
-    #     self.compress = {output: true}
-    #   end
-    #
-    # To use the specialized BZip output compressor, and the regular compressor for the input collections:
-    #   class MyJob < RocketJob::Job
-    #     include RocketJob::Batch
-    #     self.compress = {output: :bzip2, input: true}
-    #   end
-    def self.factory(type, category, job)
-      raise(ArgumentError, "Unknown type: #{type.inspect}") unless %i[input output].include?(type)
-
-      collection_name = "rocket_job.#{type}s.#{job.id}"
-      collection_name << ".#{category}" unless category == :main
-
-      args               = {collection_name: collection_name, slice_size: job.slice_size}
-      klass              = slice_class(type, job)
-      args[:slice_class] = klass if klass
-
-      if type == :input
-        RocketJob::Sliced::Input.new(args)
+    # Returns [RocketJob::Sliced::Slices] for the relevant direction and category.
+    def self.factory(direction, category, job)
+      collection_name = "rocket_job.#{direction}s.#{job.id}"
+      collection_name << ".#{category.name}" unless category.name == :main
+
+      case direction
+      when :input
+        RocketJob::Sliced::Input.new(
+          collection_name: collection_name,
+          slice_class:     category.serializer_class,
+          slice_size:      category.slice_size
+        )
+      when :output
+        RocketJob::Sliced::Output.new(collection_name: collection_name, slice_class: category.serializer_class)
       else
-        RocketJob::Sliced::Output.new(args)
-      end
-    end
-
-    private
-
-    # Parses the encrypt and compress options to determine which slice serializer to use.
-    # `encrypt` takes priority over any `compress` option.
-    def self.slice_class(type, job)
-      encrypt  = extract_value(type, job.encrypt)
-      compress = extract_value(type, job.compress)
-
-      if encrypt
-        case encrypt
-        when true
-          EncryptedSlice
-        else
-          raise(ArgumentError, "Unknown job `encrypt` value: #{compress}") unless compress.is_a?(Slices)
-          # Returns the supplied class to use for encryption.
-          encrypt
-        end
-      elsif compress
-        case compress
-        when true
-          CompressedSlice
-        when :bzip2
-          BZip2OutputSlice
-        else
-          raise(ArgumentError, "Unknown job `compress` value: #{compress}") unless compress.is_a?(Slices)
-          # Returns the supplied class to use for compression.
-          compress
-        end
+        raise(ArgumentError, "Unknown direction: #{direction.inspect}")
       end
     end
-
-    def self.extract_value(type, value)
-      value.is_a?(Hash) ? value[type] : value
-    end
   end
 end

data/lib/rocket_job/sliced/input.rb

@@ -139,7 +139,7 @@ module RocketJob
         document                 = all.queued.
                                    sort("_id" => 1).
                                    find_one_and_update(
-                                     {"$set" => {worker_name: worker_name, state: :running, started_at: Time.now}},
+                                     {"$set" => {worker_name: worker_name, state: "running", started_at: Time.now}},
                                      return_document: :after
                                    )
         document.collection_name = collection_name if document

data/lib/rocket_job/sliced/slice.rb

@@ -33,7 +33,7 @@ module RocketJob
       #
 
       # Current state, as set by AASM
-      field :state, type: Symbol, default: :queued
+      field :state, type: Mongoid::StringifiedSymbol, default: :queued
 
       # When processing started on this slice
       field :started_at, type: Time
@@ -139,18 +139,10 @@ module RocketJob
 
       # Returns [Hash] the slice as a Hash for storage purposes
       # Compresses / Encrypts the slice according to the job setting
-      if ::Mongoid::VERSION.to_i >= 6
-        def as_attributes
-          attrs            = super
-          attrs["records"] = serialize_records if @records
-          attrs
-        end
-      else
-        def as_document
-          attrs            = super
-          attrs["records"] = serialize_records if @records
-          attrs
-        end
+      def as_attributes
+        attrs            = super
+        attrs["records"] = serialize_records if @records
+        attrs
       end
 
       def inspect

data/lib/rocket_job/sliced/slices.rb

@@ -50,8 +50,8 @@ module RocketJob
 
       # Returns output slices in the order of their id
       # which is usually the order in which they were written.
-      def each
-        all.sort(id: 1).each { |document| yield(document) }
+      def each(&block)
+        all.sort(id: 1).each(&block)
       end
 
       # Insert a new slice into the collection
@@ -96,6 +96,17 @@ module RocketJob
         slice
       end
 
+      # Append to an existing slice if already present
+      def append(slice, input_slice)
+        existing_slice = all.where(id: input_slice.id).first
+        return insert(slice, input_slice) unless existing_slice
+
+        extra_records          = slice.is_a?(Slice) ? slice.records : slice
+        existing_slice.records = existing_slice.records + extra_records
+        existing_slice.save!
+        existing_slice
+      end
+
       alias << insert
 
       # Index for find_and_modify only if it is not already present
@@ -139,6 +150,7 @@ module RocketJob
       def last
         all.sort("_id" => -1).first
       end
+
       # rubocop:enable Style/RedundantSort
 
       # Returns [Array<Struct>] grouped exceptions by class name,

data/lib/rocket_job/sliced/writer/output.rb

@@ -1,30 +1,37 @@
 module RocketJob
   module Sliced
     module Writer
-      # Internal class for writing categorized results into output slices
-      class Output
+      class Null
         attr_reader :job, :categorized_records
-        attr_accessor :input_slice
-
-        # Collect output results and write to output collections
-        # iff job is collecting output
-        # Notes:
-        #   Nothing is saved if an exception is raised inside the block
-        def self.collect(job, input_slice = nil)
-          if job.collect_output?
-            writer = new(job, input_slice)
-            yield(writer)
-            writer.close
-          else
-            writer = NullWriter.new(job, input_slice)
-            yield(writer)
-          end
-        end
+        attr_accessor :input_slice, :append
 
-        def initialize(job, input_slice = nil)
+        def initialize(job, input_slice: nil, append: false)
           @job                 = job
           @input_slice         = input_slice
           @categorized_records = {}
+          @append              = append
+        end
+
+        def <<(_)
+          # noop
+        end
+
+        def close
+          # noop
+        end
+      end
+
+      # Internal class for writing categorized results into output slices
+      class Output < Null
+        # Collect output results and write to output collections
+        # iff job is collecting output
+        # Notes:
+        #   Partial slices are saved when an exception is raised inside the block
+        def self.collect(job, **args)
+          writer = job.output_categories.present? ? new(job, **args) : Null.new(job, **args)
+          yield(writer)
+        ensure
+          writer&.close
         end
 
         # Writes the supplied result, RocketJob::Batch::Result or RocketJob::Batch::Results
@@ -40,7 +47,8 @@ module RocketJob
         # Write categorized results to their relevant collections
         def close
           categorized_records.each_pair do |category, results|
-            job.output(category).insert(results, input_slice)
+            collection = job.output(category)
+            append ? collection.append(results, input_slice) : collection.insert(results, input_slice)
           end
         end
 
@@ -48,35 +56,16 @@ module RocketJob
 
         # Stores the categorized result from one result
         def extract_categorized_result(result)
-          category = :main
-          value    = result
+          named_category = :main
+          value          = result
           if result.is_a?(RocketJob::Batch::Result)
-            category = result.category
-            value    = result.value
-            raise(ArgumentError, "Invalid RocketJob Output Category: #{category}") if job.output_categories.exclude?(category)
+            named_category = result.category
+            value          = result.value
           end
-          (categorized_records[category] ||= []) << value unless value.nil? && !job.collect_nil_output?
+          (categorized_records[named_category] ||= []) << value unless value.nil? && !job.output_category(named_category).nils
         end
       end
 
-      class NullWriter
-        attr_reader :job, :categorized_records
-        attr_accessor :input_slice
-
-        def initialize(job, input_slice = nil)
-          @job                 = job
-          @input_slice         = input_slice
-          @categorized_records = {}
-        end
-
-        def <<(_)
-          # noop
-        end
-
-        def close
-          # noop
-        end
-      end
     end
   end
 end

data/lib/rocket_job/subscribers/server.rb

@@ -17,7 +17,7 @@ module RocketJob
 
           supervisor.logger.info("Stopping Pool")
           supervisor.worker_pool.stop
-          unless supervisor.worker_pool.living_count == 0
+          unless supervisor.worker_pool.living_count.zero?
             supervisor.logger.info("Giving pool #{wait_timeout} seconds to terminate")
             sleep(wait_timeout)
           end

data/lib/rocket_job/thread_worker.rb

@@ -0,0 +1,46 @@
+require "concurrent"
+module RocketJob
+  # ThreadWorker
+  #
+  # A worker runs on a single operating system thread.
+  # Is usually started under a Rocket Job server process.
+  class ThreadWorker < Worker
+    attr_reader :thread
+
+    def initialize(id:, server_name:)
+      super(id: id, server_name: server_name)
+      @shutdown = Concurrent::Event.new
+      @thread   = Thread.new { run }
+    end
+
+    def alive?
+      @thread.alive?
+    end
+
+    def backtrace
+      @thread.backtrace
+    end
+
+    def join(*args)
+      @thread.join(*args)
+    end
+
+    # Send each active worker the RocketJob::ShutdownException so that stops processing immediately.
+    def kill
+      @thread.raise(Shutdown, "Shutdown due to kill request for worker: #{name}") if @thread.alive?
+    end
+
+    def shutdown?
+      @shutdown.set?
+    end
+
+    def shutdown!
+      @shutdown.set
+    end
+
+    # Returns [true|false] whether the shutdown indicator was set
+    def wait_for_shutdown?(timeout = nil)
+      @shutdown.wait(timeout)
+    end
+  end
+end