rocketjob 5.0.0.beta4 → 5.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '048d247981e5131c03505a00a99945bc9efb9a1d862d629a5da1db9bbd2aa083'
-  data.tar.gz: 361373a9b8a8709276fc9198be95bd7f197b54c7dc067e59d91d2f648f13653f
+  metadata.gz: c53fb037073ba38fd229b6a0573a2e0a28a1f28bbb0750bc895f2f2d46b57d44
+  data.tar.gz: c5ab8fcbe268aa97909448b4e053cf54698b1f690fe537899f1ed4a5c7f7a1ed
 SHA512:
-  metadata.gz: e955117f6a72063a9de9bbea3d7ced0e1e4afa1943ff72af5f443f9fc1b2c59babeb687fc0d3924892635a328605b9421b11ee3ea18de2681f159be95595ebcf
-  data.tar.gz: e22f2bea9056da23229a29cc6fd6005dc09d8ae0a73b8bac30704636ace2cd7d347c1cfa8fcffed89680fe6b591eb77dfbeb925185594330772f11c8f8b53b29
+  metadata.gz: 69973ec5d30e2d9a63a338119121decb9c20ce8b5d0aba3d9a566799f80eaad626bb2055361bda7cbf5e60085b0fd82c68082f499e151d3a982659457173c5ff
+  data.tar.gz: 8a7b75c3d55fdc1c38c549efc91b8e7cf806ac7aa323a2c0ed1ede9f7e4b7518840d282b172446e5f5f9762685dd5a0639ce9e5fc151d173a59212a0ac5d5ee7

data/lib/rocket_job/batch/throttle_running_slices.rb

@@ -43,9 +43,11 @@ module RocketJob
 
       # Returns [Boolean] whether the throttle for this job has been exceeded
       def throttle_running_slices_exceeded?(slice)
-        throttle_running_slices &&
-          (throttle_running_slices != 0) &&
-          (input.running.where(:id.ne => slice.id).count >= throttle_running_slices)
+        return unless throttle_running_slices&.positive?
+
+        input.running.with(read: {mode: :primary}) do |conn|
+          conn.where(:id.ne => slice.id).count >= throttle_running_slices
+        end
       end
 
     end

data/lib/rocket_job/jobs/copy_file_job.rb

@@ -32,12 +32,12 @@ module RocketJob
       field :target_url, type: String, user_editable: true
 
       # Any optional arguments to pass through to the IOStreams source and/or target.
-      field :source_args, type: Hash, default: -> { {} }
-      field :target_args, type: Hash, default: -> { {} }
+      field :source_args, type: Hash, default: -> { {} }, user_editable: true
+      field :target_args, type: Hash, default: -> { {} }, user_editable: true
 
       # Any optional IOStreams streams to apply to the source and/or target.
-      field :source_streams, type: Hash, default: -> { {none: nil} }
-      field :target_streams, type: Hash, default: -> { {none: nil} }
+      field :source_streams, type: Hash, default: -> { {none: nil} }, user_editable: true
+      field :target_streams, type: Hash, default: -> { {none: nil} }, user_editable: true
 
       # Data to upload, instead of supplying `:input_file_name` above.
       # Note: Data must be less than 15MB after compression.
@@ -63,12 +63,6 @@ module RocketJob
         self.percent_complete = 100
       end
 
-      private
-
-      def set_description
-        self.description = "Copying to #{target_url}"
-      end
-
       def source_path
         source = IOStreams.path(source_url, **decrypt_args(source_args))
         apply_streams(source, source_streams)
@@ -81,6 +75,12 @@ module RocketJob
         target
       end
 
+      private
+
+      def set_description
+        self.description = "Copying to #{target_url}"
+      end
+
       def apply_streams(path, streams)
         streams.each_pair { |stream, args| path.stream(stream.to_sym, args.nil? ? {} : decrypt_args(args)) }
       end

data/lib/rocket_job/jobs/dirmon_job.rb

@@ -72,8 +72,8 @@ module RocketJob
         DirmonEntry.enabled.each do |entry|
           entry.each do |iopath|
             # S3 files are only visible once completely uploaded.
-            if iopath.is_a?(IOStreams::Paths::S3)
-              logger.info("S3 File: #{iopath}. Starting: #{entry.job_class_name}")
+            unless iopath.partial_files_visible?
+              logger.info("File: #{iopath}. Starting: #{entry.job_class_name}")
               entry.later(iopath)
               next
             end
@@ -81,6 +81,7 @@ module RocketJob
             # BSON Keys cannot contain periods
             key                 = iopath.to_s.tr('.', '_')
             previous_size       = previous_file_names[key]
+            # Check every few minutes for a file size change before trying to process the file.
             size                = check_file(entry, iopath, previous_size)
             new_file_names[key] = size if size
           end

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

@@ -36,10 +36,12 @@ module RocketJob
 
         # Returns [Boolean] whether the throttle for this job has been exceeded
         def throttle_running_jobs_exceeded?
-          throttle_running_jobs &&
-            (throttle_running_jobs != 0) &&
-            # Cannot use the class since it will include instances of parent job classes.
-            (RocketJob::Job.running.where('_type' => self.class.name, :id.ne => id).count >= throttle_running_jobs)
+          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).count >= throttle_running_jobs
+          end
         end
       end
     end

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

@@ -61,8 +61,10 @@ module RocketJob
           # Requeues all jobs that were running on a server that died
           def requeue_dead_server(server_name)
             # Need to requeue paused, failed since user may have transitioned job before it finished
-            where(:state.in => %i[running paused failed]).each do |job|
-              job.requeue!(server_name) if job.may_requeue?(server_name)
+            with(read: {mode: :primary}) do |conn|
+              conn.where(:state.in => %i[running paused failed]).each do |job|
+                job.requeue!(server_name) if job.may_requeue?(server_name)
+              end
             end
           end
 

data/lib/rocket_job/plugins/singleton.rb

@@ -12,7 +12,9 @@ module RocketJob
 
       # Returns [true|false] whether another instance of this job is already active
       def rocket_job_singleton_active?
-        self.class.where(:state.in => %i[running queued], :id.ne => id).exists?
+        self.class.with(read: {mode: :primary}) do |conn|
+          conn.where(:state.in => %i[running queued], :id.ne => id).exists?
+        end
       end
 
       private

data/lib/rocket_job/version.rb

@@ -1,3 +1,3 @@
 module RocketJob
-  VERSION = '5.0.0.beta4'.freeze
+  VERSION = '5.0.0.rc1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta4
+  version: 5.0.0.rc1
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm