worker_killer 1.0.5.213889 → 1.0.5.213977

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d0558051a55e944e97bb26729239a97d7f150fb37885af8761246f78db4e280
-  data.tar.gz: 417bb8c4f0c4818d4e2a19ad4f2cb8cc5e3ca82621b925c81c2e4b33102803fb
+  metadata.gz: 2ac9af870733f50ff006c5a31d9c3030342d76ff3208b8e4193a2407ad8f264c
+  data.tar.gz: c222a1cada623f95f8668e61d15e4f32fa986fdf799572e1937365919bc651d4
 SHA512:
-  metadata.gz: 855f6852cb2c7c8115388038f07d234958a6183c008d21b28ad8867a34a53dcfd713f34645c1b0f435fafc67f5f7ad0c1272b7b4f94f2d91b170ca91c0f97133
-  data.tar.gz: 8699bc63da513186e47cb1ef626f732e61cfe7a603231370223cbcea5ec3b6d8897a314ed5fe8dee9a23765822b4c20aa43ddc6fda7b02bb775f01aa1f838a7e
+  metadata.gz: 88918e5de623c64691e96fbfc4f34b6eb19669e3f370be011eed996ef6e9a13aee61997b66adfae929e39cb685396557c3802d9a00dcb0ebef0d54e5cf1193fb
+  data.tar.gz: bdb4e2fafb1da70554c3b73284538695bfd918b1b516a9a24f477b02056d721b69745f4ecfe6bfde044fb90815fa55f7178c08c33d9cfd283420754d0175ee69

data/lib/worker_killer/killer/puma.rb

@@ -1,12 +1,27 @@
+require 'socket'
+
 module ::WorkerKiller
   module Killer
     class Puma < ::WorkerKiller::Killer::Base
 
-      def initialize **kwrags
-        super
+      attr_accessor :type, :plugin_path, :num
+
+      def initialize(type: :phased, path: nil, num: nil, **kwargs)
+        super(**kwargs)
+        @type = type
+        @plugin_path = path
+        @num = num
+      end
+
+      def do_kill(sig, pid, alive_sec, **params)
+        if @type == :phased
+          do_phased_kill(sig, pid, alive_sec, **params)
+        elsif @type == :plugin
+          do_plugin_kill(sig, pid, alive_sec, **params)
+        end
       end
 
-      def do_kill(sig, pid, alive_sec, **_params)
+      def do_phased_kill(sig, pid, alive_sec, **_params)
         cmd = 'pumactl phased-restart'
 
         if sig == :KILL
@@ -27,6 +42,20 @@ module ::WorkerKiller
         end
       end
 
+      def do_plugin_kill(sig, pid, alive_sec, **_params)
+        if sig == :KILL
+          logger.error "#{self} force to kill self (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+          Process.kill sig, pid
+          return
+        end
+
+        logger.warn "#{self} send #{num} to Puma Plugin (pid: #{pid}) alive: #{alive_sec} sec (trial #{kill_attempts})"
+
+        Socket.unix(plugin_path) do |sock|
+          sock.puts num.to_s
+        end
+      end
+
     end
   end
 end

data/lib/worker_killer/puma/plugin/worker_killer.rb

@@ -0,0 +1,104 @@
+require 'socket'
+require 'puma/plugin'
+require 'active_support/notifications'
+
+require 'worker_killer/killer'
+
+
+
+
+module WorkerKiller
+  module Puma
+    module Plugin
+      # Puma requires such plugin name and path :(
+      class WorkerKiller
+
+        def initialize(launcher, path)
+          @runner = launcher.instance_variable_get('@runner')
+
+          @thread = Thread.new do
+            Socket.unix_server_loop(path) do |sock, _client_addrinfo|
+              if (line = sock.gets)
+                worker_num = Integer(line.strip)
+                if (worker = find_worker(worker_num))
+                  log "Killing worker #{worker_num}"
+                  worker.term!
+                end
+              end
+            rescue StandardError => e
+              log("Exception: #{e.inspect}")
+            ensure
+              sock.close
+            end
+          end
+        end
+
+        def find_worker(worker_num)
+          worker = @runner.worker_at(worker_num)
+          unless worker
+            log "Unknown worker index: #{worker_num.inspect}. Skipping."
+            return nil
+          end
+
+          unless worker.booted?
+            log "Worker #{worker_num.inspect} is not booted yet. Skipping."
+            return nil
+          end
+
+          if worker.term?
+            log "Worker #{worker_num.inspect} already terminating. Skipping."
+            return nil
+          end
+
+          worker
+        end
+
+        def log(msg)
+          warn("#{self.class}: #{msg}")
+        end
+
+      end
+    end
+  end
+end
+
+Puma::Plugin.create do
+  attr_reader :path
+
+  def config(c)
+    c.on_worker_boot do |num|
+
+      if @killer
+        puts "ON OTHER WORKER BOOT: #{num}"
+        @killer.num = num
+      else
+        puts "ON MAIN WORKER BOOT: #{num}"
+        ::ActiveSupport::Notifications.subscribe 'worker_killer.initialize' do |*eargs|
+          @killer = ::WorkerKiller::Killer::Puma.new(num: num, path: path, type: :plugin)
+          puts "ON WORKER BOOT INIT:#{num}"
+          event = ActiveSupport::Notifications::Event.new(*eargs)
+          config = event.payload[:config]
+
+          @register_killer&.call(self, config, @killer)
+        end
+      end
+    end
+  end
+
+  def start(launcher)
+    @path = File.join('tmp', "puma_worker_killer_#{Process.pid}.socket")
+
+    launcher.events.on_booted do
+      @controller ||= WorkerKiller::Puma::Plugin::WorkerKiller.new(launcher, path)
+    end
+  end
+
+  def configure(&block)
+    self.instance_eval(&block)
+  end
+
+  def register_killer(&block)
+    @register_killer = block
+  end
+end
+

data/lib/worker_killer/puma_plugin.rb

@@ -0,0 +1,58 @@
+require 'worker_killer/memory_limiter'
+require 'worker_killer/count_limiter'
+require 'puma/plugin'
+
+Puma::Plugin.create do
+
+module WorkerKiller
+  class PumaPlugin
+
+    attr_reader :limiter, :killer, :reaction
+
+    def initialize(klass:, killer:, reaction: nil, **opts)
+      @killer = killer
+
+      @reaction = reaction || proc do |l, k, dj|
+        k.kill(l.started_at, dj: dj)
+      end
+
+      @limiter = klass.new(**opts)
+      @time_to_burn = false
+    end
+
+    def new(lifecycle = Delayed::Worker.lifecycle, *_args)
+      configure_lifecycle(lifecycle)
+    end
+
+    def configure_lifecycle(lifecycle)
+      # Count condition after every job
+      lifecycle.after(:perform) do |worker, *_args|
+        @time_to_burn ||= limiter.check
+      end
+      
+      # Stop execution only after whole loop completed
+      lifecycle.after(:loop) do |worker, *_args|
+        @time_to_burn ||= limiter.check
+        reaction.call(limiter, killer, worker) if @time_to_burn
+      end
+    end
+
+    class JobsLimiter < ::WorkerKiller::PumaPlugin
+
+      def initialize(**opts)
+        super(klass: ::WorkerKiller::CountLimiter, **opts)
+      end
+
+    end
+
+    class OOMLimiter < ::WorkerKiller::PumaPlugin
+
+      def initialize(**opts)
+        super(klass: ::WorkerKiller::MemoryLimiter, **opts)
+      end
+
+    end
+
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: worker_killer
 version: !ruby/object:Gem::Version
-  version: 1.0.5.213889
+  version: 1.0.5.213977
 platform: ruby
 authors:
 - Samoilenko Yuri
@@ -135,6 +135,8 @@ files:
 - lib/worker_killer/killer/signal.rb
 - lib/worker_killer/memory_limiter.rb
 - lib/worker_killer/middleware.rb
+- lib/worker_killer/puma/plugin/worker_killer.rb
+- lib/worker_killer/puma_plugin.rb
 - lib/worker_killer/version.rb
 - spec/count_limiter_spec.rb
 - spec/delayed_job_plugin/jobs_limiter_spec.rb
@@ -173,16 +175,16 @@ signing_key:
 specification_version: 4
 summary: Kill any workers by memory and request counts or take custom reaction
 test_files:
-- spec/killer/signal_spec.rb
-- spec/killer/puma_spec.rb
-- spec/killer/delayed_job_spec.rb
-- spec/killer/passenger_spec.rb
-- spec/killer_spec.rb
-- spec/count_limiter_spec.rb
-- spec/worker_killer_spec.rb
-- spec/support/logger.rb
 - spec/middleware_spec.rb
+- spec/killer_spec.rb
 - spec/spec_helper.rb
 - spec/delayed_job_plugin/oom_limiter_spec.rb
 - spec/delayed_job_plugin/jobs_limiter_spec.rb
+- spec/killer/passenger_spec.rb
+- spec/killer/puma_spec.rb
+- spec/killer/signal_spec.rb
+- spec/killer/delayed_job_spec.rb
 - spec/memory_limiter_spec.rb
+- spec/support/logger.rb
+- spec/worker_killer_spec.rb
+- spec/count_limiter_spec.rb