einhorn 0.7.0 → 0.8.2

data/test/integration/upgrading.rb

@@ -78,6 +78,10 @@ class UpgradeTests < EinhornIntegrationTestCase
           state = YAML.load(resp['message'])
           assert_equal(1, state[:state][:children].count)
 
+          child = state[:state][:children].first.last
+          assert_in_delta(child[:pinged_at], Time.now, 60)
+          assert_equal("id-1", child[:pinged_request_id])
+
           process.terminate
         end
       end
@@ -154,4 +158,47 @@ class UpgradeTests < EinhornIntegrationTestCase
       end
     end
   end
+
+  describe "with --signal-timeout" do
+    before do
+      @dir = prepare_fixture_directory('signal_timeout')
+      @port = find_free_port
+      @server_program = File.join(@dir, "sleepy_server.rb")
+      @socket_path = File.join(@dir, "einhorn.sock")
+    end
+
+    after { cleanup_fixtured_directories }
+
+    it 'issues a SIGKILL to outdated children when signal-timeout has passed' do
+      signal_timeout = 2
+      sleep_for = 10
+      cmd = %W{
+        einhorn
+        -b 127.0.0.1:#{@port}
+        -d #{@socket_path}
+        --signal-timeout #{signal_timeout}
+        -- ruby #{@server_program}
+      }
+
+      with_running_einhorn(cmd, env: ENV.to_h.merge({'TRAP_SLEEP' => sleep_for.to_s})) do |process|
+        wait_for_open_port
+        client = Einhorn::Client.for_path(@socket_path)
+        einhornsh(%W{-d #{@socket_path} -e upgrade})
+
+        state = get_state(client)
+        assert_equal(2, state[:children].count)
+        signaled_children = state[:children].select{|_,c| c[:signaled].length > 0}
+        assert_equal(1, signaled_children.length)
+
+        sleep(signal_timeout * 2)
+
+        state = get_state(client)
+        assert_equal(1, state[:children].count)
+        signaled_children = state[:children].select{|_,c| c[:signaled].length > 0}
+        assert_equal(0, signaled_children.length)
+
+        process.terminate
+      end
+    end
+  end
 end

data/test/unit/_lib/bad_worker.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+raise 'This worker has an error during preload'
+
+def einhorn_main
+
+end

data/test/unit/_lib/sleep_worker.rb

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+def einhorn_main
+  sleep 1
+end

data/test/unit/einhorn.rb

@@ -10,7 +10,7 @@ class EinhornTest < EinhornTestCase
 
     it "correctly parses srv: arguments" do
       cmd = ['foo', 'srv:1.2.3.4:123,llama,test', 'bar']
-      Einhorn.expects(:bind).once.with('1.2.3.4', '123', ['llama', 'test']).returns(4)
+      Einhorn.expects(:bind).once.with('1.2.3.4', '123', ['llama', 'test']).returns([4, 10087])
 
       Einhorn.socketify!(cmd)
 
@@ -19,7 +19,7 @@ class EinhornTest < EinhornTestCase
 
     it "correctly parses --opt=srv: arguments" do
       cmd = ['foo', '--opt=srv:1.2.3.4:456', 'baz']
-      Einhorn.expects(:bind).once.with('1.2.3.4', '456', []).returns(5)
+      Einhorn.expects(:bind).once.with('1.2.3.4', '456', []).returns([5, 10088])
 
       Einhorn.socketify!(cmd)
 
@@ -28,7 +28,7 @@ class EinhornTest < EinhornTestCase
 
     it "uses the same fd number for the same server spec" do
       cmd = ['foo', '--opt=srv:1.2.3.4:8910', 'srv:1.2.3.4:8910']
-      Einhorn.expects(:bind).once.with('1.2.3.4', '8910', []).returns(10)
+      Einhorn.expects(:bind).once.with('1.2.3.4', '8910', []).returns([10, 10089])
 
       Einhorn.socketify!(cmd)
 
@@ -55,4 +55,42 @@ class EinhornTest < EinhornTestCase
       assert(message.nil?)
     end
   end
+
+  describe ".preload" do
+    before do
+      Einhorn::State.preloaded = false
+    end
+
+    it "updates preload on success" do
+      Einhorn.stubs(:set_argv).returns
+      # preloads the sleep worker since it has einhorn main
+      Einhorn::State.path = "#{__dir__}/_lib/sleep_worker.rb"
+      assert_equal(false, Einhorn::State.preloaded)
+      Einhorn.preload
+      assert_equal(true, Einhorn::State.preloaded)
+      # Attempt another preload 
+      Einhorn.preload
+      assert_equal(true, Einhorn::State.preloaded)
+    end
+
+    it "updates preload to failed with previous success" do
+      Einhorn.stubs(:set_argv).returns
+      Einhorn::State.path = "#{__dir__}/_lib/sleep_worker.rb"
+      assert_equal(false, Einhorn::State.preloaded)
+      Einhorn.preload
+      assert_equal(true, Einhorn::State.preloaded)
+      # Change path to bad worker and preload again, should be false
+      Einhorn::State.path = "#{__dir__}/_lib/bad_worker.rb"
+      Einhorn.preload
+      assert_equal(false, Einhorn::State.preloaded)
+    end
+
+    it "preload is false after failing" do
+      Einhorn.stubs(:set_argv).returns
+      Einhorn::State.path = "#{__dir__}/bad_worker.rb"
+      assert_equal(false, Einhorn::State.preloaded)
+      Einhorn.preload
+      assert_equal(false, Einhorn::State.preloaded)
+    end
+  end
 end

data/test/unit/einhorn/command.rb

@@ -18,4 +18,118 @@ class CommandTest < EinhornTestCase
       Command.quieter
     end
   end
+
+  describe "resignal_timeout" do
+    it "does not kill any children" do
+      Einhorn::State.stubs(signal_timeout: 5 * 60)
+      Einhorn::State.stubs(children: {
+        12345 => {last_signaled_at: nil},
+        12346 => {signaled: Set.new(["USR1"]), last_signaled_at: Time.now - (2 * 60)},
+      })
+
+      Process.expects(:kill).never
+      Einhorn::Command.kill_expired_signaled_workers
+
+      refute(Einhorn::State.children[12346][:signaled].include?("KILL"), "Process was KILLed when it shouldn't have been")
+    end
+
+    it "KILLs stuck child processes" do
+      Time.stub :now, Time.at(0) do
+        Process.stub(:kill, true) do
+          Einhorn::State.stubs(signal_timeout: 60)
+          Einhorn::State.stubs(children: {
+            12346 => {signaled: Set.new(["USR2"]), last_signaled_at: Time.now - (2 * 60)},
+          })
+
+          Einhorn::Command.kill_expired_signaled_workers
+
+          child = Einhorn::State.children[12346]
+          assert(child[:signaled].include?("KILL"), "Process was not KILLed as expected")
+          assert(child[:last_signaled_at] == Time.now, "The last_processed_at was not updated as expected")
+        end
+      end
+    end
+  end
+
+  describe "trigger_spinup?" do
+    it "is true by default" do
+      assert(Einhorn::Command.trigger_spinup?(1))
+    end
+
+    it "is false if unacked >= max_unacked" do
+      Einhorn::State.stubs(children: {12346 => {type: :worker, acked: false, signaled: Set.new}})
+      assert(Einhorn::Command.trigger_spinup?(1))
+    end
+
+    it "is false if capacity is exceeded" do
+      Einhorn::State.stubs(config: {max_upgrade_additional: 1, number: 1})
+      Einhorn::State.stubs(
+        children: {
+          1 => {type: :worker, acked: true, signaled: Set.new},
+          2 => {type: :worker, acked: true, signaled: Set.new},
+          3 => {type: :worker, acked: true, signaled: Set.new},
+        }
+      )
+      refute(Einhorn::Command.trigger_spinup?(1))
+    end
+
+    it "is true if under capacity" do
+      Einhorn::State.stubs(config: {max_upgrade_additional: 2, number: 1})
+      Einhorn::State.stubs(children: {1 => {type: :worker, acked: true, signaled: Set.new}})
+      assert(Einhorn::Command.trigger_spinup?(1))
+    end
+  end
+
+  describe "replenish_gradually" do
+    it "does nothing if an outstanding spinup timer exists" do
+      Einhorn::TransientState.stubs(has_outstanding_spinup_timer: true)
+      Einhorn::Command.expects(:spinup).never
+      Einhorn::Command.replenish_gradually
+    end
+    it "does nothing if the worker pool is full" do
+      Einhorn::TransientState.stubs(has_outstanding_spinup_timer: false)
+      Einhorn::WorkerPool.stubs(missing_worker_count: 0)
+      Einhorn::Command.expects(:spinup).never
+      Einhorn::Command.replenish_gradually
+    end
+
+    it "does nothing if we have not reached the spinup interval" do
+      Einhorn::TransientState.stubs(has_outstanding_spinup_timer: false)
+      Einhorn::WorkerPool.stubs(missing_worker_count: 1)
+      Einhorn::State.stubs(last_spinup: Time.now)
+      Einhorn::Command.expects(:spinup).never
+      Einhorn::Command.replenish_gradually
+    end
+
+    it "calls trigger_spinup? if we have reached the spinup interval" do
+      Einhorn::TransientState.stubs(has_outstanding_spinup_timer: false)
+      Einhorn::State.stubs(config: {seconds: 1, max_unacked: 2, number: 1})
+      Einhorn::WorkerPool.stubs(missing_worker_count: 1)
+      Einhorn::State.stubs(last_spinup: Time.now - 2) # 2 seconds ago
+      Einhorn::Command.expects(:trigger_spinup?).with(2).returns(false)
+      Einhorn::Command.replenish_gradually
+    end
+
+    it "can handle sub-second spinup intervals" do
+      Einhorn::TransientState.stubs(has_outstanding_spinup_timer: false)
+      Einhorn::State.stubs(config: {seconds: 0.1, max_unacked: 2, number: 1})
+      Einhorn::WorkerPool.stubs(missing_worker_count: 1)
+      Einhorn::State.stubs(last_spinup: Time.now - 0.5) # Half a second ago
+      Einhorn::Command.stubs(trigger_spinup?: true)
+      Einhorn::Command.expects(:spinup)
+      Einhorn::Command.replenish_gradually
+    end
+
+    it "registers a timer to run again at spinup interval" do
+      Einhorn::TransientState.stubs(has_outstanding_spinup_timer: false)
+      Einhorn::State.stubs(config: {seconds: 0.1, max_unacked: 2, number: 1})
+      Einhorn::WorkerPool.stubs(missing_worker_count: 1)
+      Einhorn::State.stubs(last_spinup: Time.now - 1)
+      Einhorn::Command.stubs(trigger_spinup?: true)
+      Einhorn::Command.stubs(:spinup)
+      Einhorn::TransientState.expects(:has_outstanding_spinup_timer=).with(true)
+      Einhorn::Event::Timer.expects(:open).with(0.1)
+      Einhorn::Command.replenish_gradually
+    end
+  end
 end

metadata

@@ -1,110 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.7.0
-  prerelease: 
+  version: 0.8.2
 platform: ruby
 authors:
 - Greg Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2020-10-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
 - !ruby/object:Gem::Dependency
   name: chalk-rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: subprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Einhorn makes it easy to run multiple instances of an application server,
@@ -119,8 +120,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CONTRIBUTORS
 - Gemfile
 - History.txt
@@ -147,6 +148,8 @@ files:
 - lib/einhorn/event/loop_breaker.rb
 - lib/einhorn/event/persistent.rb
 - lib/einhorn/event/timer.rb
+- lib/einhorn/prctl.rb
+- lib/einhorn/prctl_linux.rb
 - lib/einhorn/third.rb
 - lib/einhorn/version.rb
 - lib/einhorn/worker.rb
@@ -156,11 +159,16 @@ files:
 - test/integration/_lib/fixtures/env_printer/env_printer.rb
 - test/integration/_lib/fixtures/exit_during_upgrade/exiting_server.rb
 - test/integration/_lib/fixtures/exit_during_upgrade/upgrade_reexec.rb
+- test/integration/_lib/fixtures/pdeathsig_printer/pdeathsig_printer.rb
+- test/integration/_lib/fixtures/signal_timeout/sleepy_server.rb
 - test/integration/_lib/fixtures/upgrade_project/upgrading_server.rb
 - test/integration/_lib/helpers.rb
 - test/integration/_lib/helpers/einhorn_helpers.rb
+- test/integration/pdeathsig.rb
 - test/integration/startup.rb
 - test/integration/upgrading.rb
+- test/unit/_lib/bad_worker.rb
+- test/unit/_lib/sleep_worker.rb
 - test/unit/einhorn.rb
 - test/unit/einhorn/client.rb
 - test/unit/einhorn/command.rb
@@ -170,43 +178,45 @@ files:
 homepage: https://github.com/stripe/einhorn
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 3.1.2
 signing_key: 
-specification_version: 3
-summary: ! 'Einhorn: the language-independent shared socket manager'
+specification_version: 4
+summary: 'Einhorn: the language-independent shared socket manager'
 test_files:
 - test/_lib.rb
 - test/integration/_lib.rb
 - test/integration/_lib/fixtures/env_printer/env_printer.rb
 - test/integration/_lib/fixtures/exit_during_upgrade/exiting_server.rb
 - test/integration/_lib/fixtures/exit_during_upgrade/upgrade_reexec.rb
+- test/integration/_lib/fixtures/pdeathsig_printer/pdeathsig_printer.rb
+- test/integration/_lib/fixtures/signal_timeout/sleepy_server.rb
 - test/integration/_lib/fixtures/upgrade_project/upgrading_server.rb
 - test/integration/_lib/helpers.rb
 - test/integration/_lib/helpers/einhorn_helpers.rb
+- test/integration/pdeathsig.rb
 - test/integration/startup.rb
 - test/integration/upgrading.rb
+- test/unit/_lib/bad_worker.rb
+- test/unit/_lib/sleep_worker.rb
 - test/unit/einhorn.rb
 - test/unit/einhorn/client.rb
 - test/unit/einhorn/command.rb
 - test/unit/einhorn/command/interface.rb
 - test/unit/einhorn/event.rb
 - test/unit/einhorn/worker_pool.rb
-has_rdoc: