worker_killer 1.0.2.187805 → 1.0.3.189098

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d3c21030cbbe79605a447ab1c25907b0d75c826090650b03eb1899b98581c7b
-  data.tar.gz: c32c301433c80c608ca99961ef124fe4669f5db9cad1f07d5124c5b58234e3e1
+  metadata.gz: 833e8af55d32a033c006174376730eeb13939b9a71428bced0bd6fbbf31a3fbf
+  data.tar.gz: 8867071b25e0bcfaea641fdc5595794cfd4ad166da32f6aa55d600322e925bf0
 SHA512:
-  metadata.gz: c483c498cecdb6a0bb04cfd2bbb57d34a386d6398d3dc5d075aedc8cad63cf145f9b78833264a2bfd10d78bc588bbdf9400007d13cab03bf421e2b9d065b9d45
-  data.tar.gz: 60912f376e59463feaa46b34d88e1ac08d4810ad9388049dafd3f1acacb1da3deee720655a4dff63f85b00037badb9b4d2d8a33d2d3eb77a3cc8c48e8fea180f
+  metadata.gz: 7ceb0b3fdfb56a24480ff28a809dcb6bf96613d31fefa2c9fd2eca60e12205ef211c160683e6c9f42bb06928126476393430d3d6972da497872c886d2fcdd319
+  data.tar.gz: c74db721a9e0684598abc4f0d40f1aeb7b55be6d77e14a214b15431d0d1012272df43ff584d41673f8f5f28b5037ef441ae39938c093b1aba7a5d85d3fadd60f

data/lib/worker_killer/count_limiter.rb

@@ -17,12 +17,12 @@ module WorkerKiller
       @started_at ||= Time.now
 
       if @verbose
-        logger.info "#{self}: worker (pid: #{Process.pid}) has #{@left} left before being limited"
+        logger.info "#{self.class}: worker (pid: #{Process.pid}) has #{@left} left before being limited"
       end
 
       return false if (@left -= 1) > 0
 
-      logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds max number of requests (limit: #{@limit})"
+      logger.warn "#{self.class}: worker (pid: #{Process.pid}) exceeds max number of requests (limit: #{@limit})"
 
       true
     end

data/lib/worker_killer/killer/delayed_job.rb

@@ -4,18 +4,18 @@ module WorkerKiller
 
       def do_kill(sig, pid, alive_sec, dj:, **_params)
         if sig == :KILL
-          logger.error "#{self} force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+          logger.error "#{self.class}: force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
           Process.kill sig, pid
           return
         end
 
         dj.stop
-        logger.info "#{self} try to stop DelayedJob due to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+        logger.info "#{self.class}: try to stop DelayedJob due to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
 
         return if sig != :TERM
 
         if @termination
-          logger.warn "#{self} force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+          logger.warn "#{self.class}: force to #{sig} self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
           Process.kill sig, pid
         else
           @termination = true

data/lib/worker_killer/killer.rb

@@ -4,7 +4,7 @@ module WorkerKiller
 
       attr_accessor :config, :kill_attempts, :logger
 
-      def initialize(logger: WorkerKiller.configuration.logger, **_kwargs)
+      def initialize(logger: nil, **_kwargs)
         @logger = logger
         @config = WorkerKiller.configuration
         @kill_attempts = 0
@@ -27,6 +27,10 @@ module WorkerKiller
         raise 'Not Implemented'
       end
       # :nocov:
+      
+      def logger
+        @logger || WorkerKiller.configuration.logger
+      end
 
     end
   end

data/lib/worker_killer/memory_limiter.rb

@@ -5,36 +5,57 @@ module WorkerKiller
 
     attr_reader :min, :max, :limit, :started_at, :check_cycle
 
-    def initialize(min: (1024**3), max: (2 * (1024**3)), check_cycle: 16, verbose: false)
-      @min = min
-      @max = max
-      @limit = @min + WorkerKiller.randomize(@max - @min + 1)
+    def initialize(min:, max:, check_cycle: 16, verbose: false)
+      if min
+        # set static memory limits
+        @min = min
+        @max = max
+        @limit = @min + WorkerKiller.randomize(@max - @min + 1)
+        @limit_mb = (@limit / 1024 / 1024).round(1)
+      else
+        # prepare for relative memory limits
+        @max_percent = max
+      end
+
       @check_cycle = check_cycle
       @check_count = 0
       @verbose = verbose
     end
 
     def check
-      return nil if @limit <= 1024**2
-
       @started_at ||= Time.now
       @check_count += 1
 
       return nil if (@check_count % @check_cycle) != 0
 
       rss = GetProcessMem.new.bytes
+      # initialize relative memory limits on first check
+      set_limits(rss, rss + rss * @max_percent) if min.nil?
+
+      do_check(rss)
+    end
+
+    def do_check(rss)
+      rss_mb = (rss / 1024 / 1024).round(1)
+
       if @verbose
-        logger.info "#{self}: worker (pid: #{Process.pid}) using #{rss} bytes(#{rss / 1024 / 1024}mb)."
+        logger.info "#{self.class}: worker (pid: #{Process.pid}) using #{rss_mb} MB (of #{@limit_mb} MB)"
       end
       @check_count = 0
 
       return false if rss <= @limit
 
-      logger.warn "#{self}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss} bytes > #{@limit} bytes)"
+      logger.warn "#{self.class}: worker (pid: #{Process.pid}) exceeds memory limit (#{rss_mb} MB > #{@limit_mb} MB)"
 
       true
     end
 
+    def set_limits(min, max)
+      @min = min
+      @limit = @max = max
+      @limit_mb = (@limit / 1024 / 1024).round(1)
+    end
+
     def logger
       WorkerKiller.configuration.logger
     end

data/lib/worker_killer/version.rb

@@ -2,7 +2,7 @@
 
 module WorkerKiller
 
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 
 end
 

data/spec/delayed_job_plugin/jobs_limiter_spec.rb

@@ -1,13 +1,12 @@
 RSpec.describe WorkerKiller::DelayedJobPlugin::JobsLimiter do
-
-  let(:killer) {double}
+  let(:killer) { double }
   subject(:plugin){ described_class.new(killer: killer) }
 
   context 'DelayedJob initialization' do
     let(:lifecycle) { double }
     subject(:instance) { plugin.new(lifecycle) }
-    
-    it  do
+
+    it do
       expect(lifecycle).to receive(:after).with(:perform).and_yield
       expect(lifecycle).to receive(:after).with(:loop).and_yield
       instance

data/spec/delayed_job_plugin/oom_limiter_spec.rb

@@ -1,13 +1,12 @@
 RSpec.describe WorkerKiller::DelayedJobPlugin::OOMLimiter do
-
-  let(:killer) {double}
-  subject(:plugin){ described_class.new(killer: killer) }
+  let(:killer) { double }
+  subject(:plugin){ described_class.new(min: (1024**3), max: (2 * (1024**3)), killer: killer) }
 
   context 'DelayedJob initialization' do
     let(:lifecycle) { double }
     subject(:instance) { plugin.new(lifecycle) }
-    
-    it  do
+
+    it do
       expect(lifecycle).to receive(:after).with(:perform).and_yield
       expect(lifecycle).to receive(:after).with(:loop).and_yield
       instance

data/spec/memory_limiter_spec.rb

@@ -2,13 +2,10 @@ RSpec.describe WorkerKiller::MemoryLimiter do
   let(:logger){ Logger.new(nil) }
 
   subject{ described_class.new(**options) }
-  let(:mb){ 1024 * 1024 }
-  let(:min){ rand(50..100) * mb }
-  let(:max){ min + rand(100) * mb }
   let(:check_cycle){ 5 }
-  let(:options){ { min: min, max: max, check_cycle: check_cycle, verbose: true} }
+  let(:options){ { min: min, max: max, check_cycle: check_cycle, verbose: true } }
+  let(:memory) { instance_double(GetProcessMem) }
 
-  it { is_expected.to have_attributes(min: min, max: max, limit: a_value_between(min, max)) }
 
   def skip_cycles(object, cycles)
     (cycles - 1).times do
@@ -16,28 +13,68 @@ RSpec.describe WorkerKiller::MemoryLimiter do
     end
   end
 
-  it 'expect to skip check while less than cycle count' do
-    expect(GetProcessMem).not_to receive(:new)
-
-    skip_cycles(subject, check_cycle)
+  before do
+    allow(GetProcessMem).to receive(:new).and_return(memory)
   end
 
-  it 'expect to skip check after cycle count reached' do
-    memory = instance_double(GetProcessMem)
-    expect(memory).to receive(:bytes).and_return(min - 1)
-    expect(GetProcessMem).to receive(:new).and_return(memory)
+  context 'fixed memory limit' do
+    let(:mb){ 1024 * 1024 }
+    let(:min){ rand(50..100) * mb }
+    let(:max){ min + rand(100) * mb }
+
+    it { is_expected.to have_attributes(min: min, max: max, limit: a_value_between(min, max)) }
+
+    it 'expect to skip check while less than cycle count' do
+      expect(GetProcessMem).not_to receive(:new)
+
+      skip_cycles(subject, check_cycle)
+    end
+
+    it 'expect to skip check after cycle count reached' do
+      expect(memory).to receive(:bytes).and_return(min - 1)
+
+      skip_cycles(subject, check_cycle)
+      expect(subject.check).to be_falsey
+    end
 
-    skip_cycles(subject, check_cycle)
-    expect(subject.check).to be_falsey
+    it 'expect call reaction when check succeded' do
+      expect(memory).to receive(:bytes).and_return(subject.limit + 1)
+
+      skip_cycles(subject, check_cycle)
+      expect(subject.check).to be_truthy
+    end
   end
 
-  it 'expect call reaction when check succeded' do
-    memory = instance_double(GetProcessMem)
-    expect(memory).to receive(:bytes).and_return(subject.limit + 1)
-    expect(GetProcessMem).to receive(:new).and_return(memory)
+  context 'relative memory limit' do
+    let(:min){ nil }
+    let(:max){ 0.5 }
+    let(:rss) { 100 * 1024 * 1024 }
+    let(:min_expected) { rss }
+    let(:max_expected) { min_expected + min_expected * max }
 
-    skip_cycles(subject, check_cycle)
-    expect(subject.check).to be_truthy
+    it { is_expected.to have_attributes(min: nil, max: nil, limit: nil) }
+
+    it 'expect to initialize limits on first check' do
+      expect(memory).to receive(:bytes).and_return(rss)
+
+      skip_cycles(subject, check_cycle)
+      is_expected.to have_attributes(min: nil, max: nil, limit: nil)
+
+      expect(subject.check).to be_falsey
+
+      is_expected.to have_attributes(min: min_expected, max: max_expected, limit: max_expected)
+    end
+
+    it 'expect call reaction when check succeded' do
+      expect(memory).to receive(:bytes).and_return(rss)
+
+      skip_cycles(subject, check_cycle)
+      expect(subject.check).to be_falsey
+
+      expect(memory).to receive(:bytes).and_return(subject.limit + 1)
+      skip_cycles(subject, check_cycle)
+      expect(subject.check).to be_truthy
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 1.0.2.187805
+  version: 1.0.3.189098
 platform: ruby
 authors:
 - Samoilenko Yuri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-28 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: get_process_mem