zombie_passenger_killer 0.1.2 → 0.1.3

data/Readme.md

@@ -34,11 +34,13 @@ Usage
 ### Bluepill script
 
     app.process("zombie_passenger_killer") do |process|
-      process.start_command = "zombie_passenger_killer --max 5 --history 10 --cpu 30 --interval 10 >> /var/log/autorotate/zombie_passenger_killer.log 2>&1"
+      process.start_command = "zombie_passenger_killer --max 5 --history 10 --cpu 30 --interval 10"
+      process.stdout = process.stderr = "/var/log/autorotate/zombie_passenger_killer.log"
       process.pid_file = "/var/run/zombie_passenger_killer.pid"
       process.daemonize = true
     end
 
+
 ### God script
 
 TODO

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/zombie_passenger_killer.rb

@@ -1,6 +1,8 @@
 class ZombiePassengerKiller
   VERSION = File.read( File.join(File.dirname(__FILE__),'..','VERSION') ).strip
 
+  attr_accessor :out # overwriteable for tests
+
   def initialize(options)
     @history = {}
     @history_entries = options[:history] || 5
@@ -8,6 +10,8 @@ class ZombiePassengerKiller
     @high_cpu = options[:cpu] || 70
     @grace_time = options[:grace] || 5
     @pattern = options[:pattern] || ' Rack: '
+    @strace_time = 5
+    @out = STDOUT
   end
 
   def store_current_cpu(processes)
@@ -22,7 +26,8 @@ class ZombiePassengerKiller
   end
 
   def get_strace(pid, time)
-    %x(timeout #{time} strace -p #{pid} 2>&1) if system("which timeout > /dev/null")
+    Process.getpgid(pid) rescue return 'No such process'
+    `( strace -p #{pid} 2>&1 ) & sleep #{time} ; kill $! 2>&1`
   end
 
   def hunt_zombies
@@ -57,10 +62,10 @@ class ZombiePassengerKiller
   end
 
   def kill_zombie(pid)
-    puts "Killing passenger process #{pid}"
-    puts get_strace(pid, 5)
-    puts %x(kill #{pid})
+    @out.puts "Killing passenger process #{pid}"
+    @out.puts get_strace(pid, @strace_time)
+    Process.kill('TERM', pid) rescue nil
     sleep @grace_time
-    %x(kill -9 #{pid})
+    Process.kill('KILL', pid) rescue nil
   end
 end

data/spec/zombie_passenger_killer_spec.rb

@@ -11,56 +11,127 @@ describe ZombiePassengerKiller do
     ZombiePassengerKiller::VERSION.should =~ /^\d+\.\d+\.\d+$/
   end
 
-  it "does not kill anything by default" do
-    killer.should_not_receive(:kill_zombie)
-    killer.hunt_zombies
-  end
+  describe "#hunt_zombies" do
+    it "does not kill anything by default" do
+      killer.should_not_receive(:kill_zombie)
+      killer.hunt_zombies
+    end
 
-  it "kill zombies" do
-    killer.stub!(:passenger_pids).and_return([123])
-    killer.stub!(:process_status).and_return([{:pid => 124, :cpu => 0}])
-    killer.should_receive(:kill_zombie).with(124)
-    killer.hunt_zombies
-  end
+    it "finds the right zombies" do
+      killer.stub!(:passenger_pids).and_return([123])
+      killer.stub!(:process_status).and_return([{:pid => 124, :cpu => 0}])
+      killer.should_receive(:kill_zombie).with(124)
+      killer.hunt_zombies
+    end
 
-  it "kills zombies with high cpu over max" do
-    @options = {:max => 1}
-    killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-    killer.should_receive(:kill_zombie).with(111)
-    killer.hunt_zombies
-  end
+    it "kills zombies with high cpu over max" do
+      @options = {:max => 1}
+      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
+      killer.should_receive(:kill_zombie).with(111)
+      killer.hunt_zombies
+    end
 
-  it "does not kills zombies with high cpu under max" do
-    @options = {:max => 2}
-    killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-    killer.should_not_receive(:kill_zombie).with(111)
-    killer.hunt_zombies
-  end
+    it "does not kills zombies with high cpu under max" do
+      @options = {:max => 2}
+      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
+      killer.should_not_receive(:kill_zombie).with(111)
+      killer.hunt_zombies
+    end
 
-  it "ignores high cpu levels in old history" do
-    @options = {:max => 2, :history => 2}
-    killer.should_not_receive(:kill_zombie).with(111)
-    killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-    killer.hunt_zombies
-    killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 0}])
-    killer.hunt_zombies
-    killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-    killer.hunt_zombies
-  end
+    it "ignores high cpu levels in old history" do
+      @options = {:max => 2, :history => 2}
+      killer.should_not_receive(:kill_zombie).with(111)
+      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
+      killer.hunt_zombies
+      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 0}])
+      killer.hunt_zombies
+      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
+      killer.hunt_zombies
+    end
 
-  it "kills on high cpu levels in recent history" do
-    @options = {:max => 2, :history => 2}
-    killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
-    killer.hunt_zombies
-    killer.should_receive(:kill_zombie).with(111)
-    killer.hunt_zombies
+    it "kills on high cpu levels in recent history" do
+      @options = {:max => 2, :history => 2}
+      killer.stub!(:process_status).and_return([{:pid => 111, :cpu => 100}])
+      killer.hunt_zombies
+      killer.should_receive(:kill_zombie).with(111)
+      killer.hunt_zombies
+    end
   end
 
-  it "prints its version" do
-    `./bin/zombie_passenger_killer -v`.should =~ /^\d+\.\d+\.\d+$/m
+  describe "#kill_zombies" do
+    before do
+      killer.out = StringIO.new
+      killer.instance_eval{
+        @grace_time = 0.1
+        @strace_time = 0.1
+      }
+    end
+
+    def pid_of(marker)
+      processes = `ps -ef | grep '#{marker}' | grep -v grep`
+      processes.strip.split("\n").last.split(/\s+/)[1].to_i
+    end
+
+    def start_bogus_process(options={})
+      marker = "TEST---#{rand(999999999999)}"
+      Thread.new do
+        `ruby -e 'at_exit{ puts "proper exit"; #{'sleep 10' if options[:hang]}}; sleep 10; puts "#{marker}"' 2>&1`
+      end
+      sleep 1 # give process time to spin up
+      pid_of(marker)
+    end
+
+    def process_alive?(pid)
+      Process.getpgid(pid)
+    rescue Errno::ESRCH
+      false
+    end
+
+    def output
+      killer.out.rewind
+      killer.out.read
+    end
+
+    it "kills normal processes" do
+      pid = start_bogus_process
+      lambda{
+        killer.kill_zombie(pid)
+        sleep 0.1
+      }.should change{ process_alive?(pid) }
+    end
+
+    it "kills hanging processes" do
+      pid = start_bogus_process :hang => true
+      lambda{
+        killer.kill_zombie(pid)
+        sleep 0.1
+      }.should change{ process_alive?(pid) }
+    end
+
+    it "prints an strace of the process" do
+      pid = start_bogus_process
+      killer.kill_zombie(pid)
+      output.should include('attach:')
+    end
+
+    it "does not take a strace of a dead process" do
+      killer.kill_zombie(111)
+      output.should_not include('attach:')
+    end
+
+    it "does not fail with an unknown pid" do
+      killer.kill_zombie(111)
+      output.should include('No such process')
+    end
   end
 
-  it "prints help" do
-    `./bin/zombie_passenger_killer -h`.should include('Usage')
+  describe "cli" do
+    it "prints its version" do
+      `./bin/zombie_passenger_killer -v`.should =~ /^\d+\.\d+\.\d+$/m
+    end
+
+    it "prints help" do
+      `./bin/zombie_passenger_killer -h`.should include('Usage')
+    end
   end
 end

data/zombie_passenger_killer.gemspec

@@ -4,14 +4,13 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{zombie_passenger_killer}
-  s.version = "0.1.2"
+  s.name = "zombie_passenger_killer"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]
-  s.date = %q{2011-09-09}
-  s.default_executable = %q{zombie_passenger_killer}
-  s.email = %q{michael@grosser.it}
+  s.date = "2012-01-05"
+  s.email = "michael@grosser.it"
   s.executables = ["zombie_passenger_killer"]
   s.files = [
     "Gemfile",
@@ -25,10 +24,10 @@ Gem::Specification.new do |s|
     "spec/zombie_passenger_killer_spec.rb",
     "zombie_passenger_killer.gemspec"
   ]
-  s.homepage = %q{http://github.com/grosser/zombie_passenger_killer}
+  s.homepage = "http://github.com/grosser/zombie_passenger_killer"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Guaranteed zombie passengers death}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Guaranteed zombie passengers death"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zombie_passenger_killer
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Grosser
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-09 00:00:00 +02:00
-default_executable: zombie_passenger_killer
+date: 2012-01-05 00:00:00 Z
 dependencies: []
 
 description: 
@@ -38,7 +37,6 @@ files:
 - spec/spec_helper.rb
 - spec/zombie_passenger_killer_spec.rb
 - zombie_passenger_killer.gemspec
-has_rdoc: true
 homepage: http://github.com/grosser/zombie_passenger_killer
 licenses: []
 
@@ -68,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Guaranteed zombie passengers death