inst-jobs 3.1.12 → 3.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f195dab509c699ad54fc7d3a3a2de0d6b1d89496c16ac5cfe5d070468cb8f337
-  data.tar.gz: 6b3d54760c5c54735676bf66e327b47ffe7fd04e4e56c3153f79814462ac7b34
+  metadata.gz: 2342458023c7d56e82311cd05089b8a748c266b462289a5ce5ba9c169a89abbe
+  data.tar.gz: b9cf5ced42b4a1d18f3599203c55683218c94d71c9f5671db58c8c49ba502ef6
 SHA512:
-  metadata.gz: e571bbee3ce87f5b2f1a6d7991d7f1b7a8b6105babb1f53ef9ee1f5265a8dfa39fee12e2d942c67ccfa6eaa689e66934be08747913fdcea1f20d58bacc6c6290
-  data.tar.gz: b9f49ac1a6c0b5845376da221368b8914a753ce58a4d53c4391eb46530b1e4216e48f9d2008302b8da77621f119562a84c6ce9394f5e17f450cd0398ad288cd1
+  metadata.gz: 5b234730e2acb907a880e564b8e7036ff64e9b3d09c18426779c125e7f7c2dbc83629d1c11157131137b0902a128f1a3cfba968e611a77e82782adabfdca6d96
+  data.tar.gz: d3487c737f65ced442c1219ae929eefd1247bb5753f345d06991634262fa592671ea37c798044b0477f038b2e2958c083bc38b9c5b4d344e9a557ec450cfb400

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.1.12"
+  VERSION = "3.1.13"
 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.13
 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-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord