inst-jobs 3.1.12 → 3.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f195dab509c699ad54fc7d3a3a2de0d6b1d89496c16ac5cfe5d070468cb8f337
-  data.tar.gz: 6b3d54760c5c54735676bf66e327b47ffe7fd04e4e56c3153f79814462ac7b34
+  metadata.gz: 16e359eba573f46a29762f1afd4bb55a52fcc9252f25ff61779f7f9b136d8f92
+  data.tar.gz: 2983f7040757c9421ae2464c79599556cd0286678ada618787c9fbe5019eca34
 SHA512:
-  metadata.gz: e571bbee3ce87f5b2f1a6d7991d7f1b7a8b6105babb1f53ef9ee1f5265a8dfa39fee12e2d942c67ccfa6eaa689e66934be08747913fdcea1f20d58bacc6c6290
-  data.tar.gz: b9f49ac1a6c0b5845376da221368b8914a753ce58a4d53c4391eb46530b1e4216e48f9d2008302b8da77621f119562a84c6ce9394f5e17f450cd0398ad288cd1
+  metadata.gz: b8296ac3fe9c675ed42f02ad7a112534d30bf212f57ca288313615eb2fa2954f114cd1a5c0f20ca886a11a6ed8085bed5c21d355f63ddadb52ba3508a341cc47
+  data.tar.gz: 65c2307f632d2dd2360fa0dc97c2c5fa373185c9c1fb78b7c057e970166a25742faa0a294bc8382cee895fc96c3d6302e7af6dbeb2bc44f99bbfff9f792edcd8

data/lib/delayed/backend/active_record.rb

@@ -25,6 +25,8 @@ module Delayed
         include Delayed::Backend::Base
         self.table_name = :delayed_jobs
 
+        attr_accessor :enqueue_result
+
         scope :next_in_strand_order, -> { order(:strand_order_override, :id) }
 
         def self.reconnect!
@@ -106,7 +108,8 @@ module Delayed
           end
 
           # https://www.postgresql.org/docs/9.5/libpq-exec.html
-          sql << " RETURNING id"
+          # https://stackoverflow.com/questions/39058213/differentiate-inserted-and-updated-rows-in-upsert-using-system-columns
+          sql << " RETURNING id, (xmax = 0) AS inserted"
 
           if lock_and_insert
             # > Multiple queries sent in a single PQexec call are processed in a single transaction,
@@ -120,12 +123,22 @@ module Delayed
             end
             result = connection.execute(sql, "#{self.class} Create")
             self.id = result.values.first&.first
+            inserted = result.values.first&.second
             result.clear
           else
             result = connection.exec_query(sql, "#{self.class} Create", binds)
             self.id = connection.send(:last_inserted_id, result)
+            inserted = result.rows.first&.second
           end
 
+          self.enqueue_result = if id.present? && inserted
+                                  :inserted
+                                elsif id.present? && !inserted
+                                  :updated
+                                else
+                                  :dropped
+                                end
+
           # it might not get set if there was an existing record, and we didn't update it
           if id
             @new_record = false

data/lib/delayed/message_sending.rb

@@ -94,7 +94,7 @@ module Delayed
     def __calculate_sender_for_delay
       # enforce public send in dev and test, but not prod (since it uses
       # debug APIs, it's expensive)
-      return sender(1) if ::Rails.env.test? || ::Rails.env.development?
+      sender(1) if ::Rails.env.test? || ::Rails.env.development?
     end
 
     module ClassMethods

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.12"
+  VERSION = "3.1.14"
 end

data/lib/delayed/worker.rb

@@ -64,6 +64,7 @@ module Delayed
       @max_priority = options[:max_priority]
       @max_job_count = options[:worker_max_job_count].to_i
       @max_memory_usage = options[:worker_max_memory_usage].to_i
+      @memory_high_water = options[:worker_memory_high_water]&.to_i || (@max_memory_usage / 2)
       @work_queue = options.delete(:work_queue) || WorkQueue::InProcess.new
       @health_check_type = Settings.worker_health_check_type
       @health_check_config = Settings.worker_health_check_config
@@ -99,6 +100,11 @@ module Delayed
 
     def start
       logger.info "Starting worker"
+      begin
+        Process.setrlimit(:DATA, @max_memory_usage, @max_memory_usage * 2) if @max_memory_usage.positive?
+      rescue Errno::EINVAL
+        # couldn't set an OS-level limit
+      end
       self.process_name =
         "start:#{Settings.worker_procname_prefix}#{@queue_name}:#{min_priority || 0}:#{max_priority || "max"}"
       @self_pipe = IO.pipe
@@ -184,10 +190,10 @@ module Delayed
               @exit = true
             end
 
-            if @max_memory_usage.positive?
+            if @memory_high_water.positive?
               memory = sample_memory
-              if memory > @max_memory_usage
-                logger.debug "Memory usage of #{memory} exceeds max of #{@max_memory_usage}, dying"
+              if memory > @memory_high_water
+                logger.debug "Memory usage of #{memory} exceeds high water of #{@memory_high_water}, dying"
                 @exit = true
               else
                 logger.debug "Memory usage: #{memory}"
@@ -233,6 +239,11 @@ module Delayed
         # still reschedule the job though.
         job.reschedule(e)
       rescue Exception => e # rubocop:disable Lint/RescueException
+        if e.is_a?(NoMemoryError)
+          GC.start # try and free up some memory before reporting the error
+          logger.debug "Could not allocate memory (max is #{@max_memory_usage}), dying"
+          @exit = true
+        end
         self.class.lifecycle.run_callbacks(:error, self, job, e) do
           handle_failed_job(job, e)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.1.12
+  version: 3.1.14
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -116,20 +116,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
@@ -242,20 +228,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -372,16 +344,16 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement