einhorn 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 308e0777b30c0d943079572f431fa7892c5bd36e
-  data.tar.gz: 39992f0151df4f7c2c6d9c9455466a9ed0359c5e
+  metadata.gz: 4846316f97d2a31a2012b011448d4484bd2b0a10
+  data.tar.gz: 234857a3665289df26b682c744dd0bff01885829
 SHA512:
-  metadata.gz: da802c21aa7331fd2dd6597d3940a33622b13a2d4febc2736604ceb5c0b457e6f61930ad705d9f33e99477325b6c5cf2ee08006f5b688b36dc13ad040c5c0112
-  data.tar.gz: b5560a45b9f4de82ae2a9ac424333d63c0aafb93c578421ff100eb51eedac8652ac5cf0191c2189d30fcb8085b898e49d1433a51130f2dacf4103abf5be3f613
+  metadata.gz: 4fe4142f182bf1f4af2923b0bbab0b6e12834d6f7a9e55635a313c425266ec7dae0bee52709d733f713103b05f11490a245b7f3bb5db534e2bd5e0560df6608a
+  data.tar.gz: a141cde6246d6df28c0fea3d4db57335d5434ad78932316002c0b9250f2b52dcd3233c4cad6e45e119393144fb0540c1e352c128065d0e982d82895590d70923

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/einhorn.rb

@@ -130,11 +130,29 @@ module Einhorn
         message << "upgraded :reloading_for_preload_upgrade to :reloading_for_upgrade"
       end
 
-      # For a period, we created children entries for state_passers,
-      # but we don't want that (in particular, it probably died before
-      # we could setup our SIGCHLD handler
       if updated_state[:children]
+        # For a period, we created children entries for state_passers,
+        # but we don't want that (in particular, it probably died
+        # before we could setup our SIGCHLD handler
         updated_state[:children].delete_if {|k, v| v[:type] == :state_passer}
+
+        # Depending on what is passed for --reexec-as, it's possible
+        # that the process received a SIGCHLD while something other
+        # than einhorn was the active executable. If that happened,
+        # einhorn might not know about a dead child, so let's check
+        # them all
+        dead = []
+        updated_state[:children].each do |pid, v|
+          begin
+            pid = Process.wait(pid, Process::WNOHANG)
+            dead << pid if pid
+          rescue Errno::ECHILD
+            dead << pid
+          end
+        end
+        Einhorn::Event::Timer.open(0) do
+          dead.each {|pid| Einhorn::Command.mourn(pid)}
+        end
       end
     end
 

data/test/integration/_lib/fixtures/exit_during_upgrade/exiting_server.rb

@@ -0,0 +1,22 @@
+require 'bundler/setup'
+require 'socket'
+require 'einhorn/worker'
+
+def einhorn_main
+  serv = Socket.for_fd(Einhorn::Worker.socket!)
+  Einhorn::Worker.ack!
+
+  Signal.trap('USR2') do
+    sleep 3
+    exit!
+  end
+
+  while true
+    s, _ = serv.accept
+    s.write($$)
+    s.flush
+    s.close
+  end
+end
+
+einhorn_main if $0 == __FILE__

data/test/integration/_lib/fixtures/exit_during_upgrade/upgrade_reexec.rb

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$1" = "--with-state-fd" ]; then
+  sleep 6
+fi
+exec bundle exec --keep-file-descriptors einhorn "$@"

data/test/integration/_lib/helpers/einhorn_helpers.rb

@@ -90,7 +90,7 @@ module Helpers
       @fixtured_dirs ||= Set.new
       new_dir = Dir.mktmpdir(name)
       @fixtured_dirs << new_dir
-      FileUtils.cp_r(File.join(fixture_path(name), '.'), new_dir)
+      FileUtils.cp_r(File.join(fixture_path(name), '.'), new_dir, :preserve => true)
 
       new_dir
     end

data/test/integration/upgrading.rb

@@ -1,5 +1,6 @@
 require(File.expand_path('_lib', File.dirname(__FILE__)))
 require 'socket'
+require 'einhorn/client'
 
 class UpgradeTests < EinhornIntegrationTestCase
   include Helpers::EinhornHelpers
@@ -53,6 +54,34 @@ class UpgradeTests < EinhornIntegrationTestCase
         end
       end
 
+      it 'cleans up if a child dies during the reexec' do
+        # attempt to setup a scenario where a child exits in the
+        # interlude after old einhorn has execed the reexec-as
+        # command, but before the reexec-as command execs new einhorn
+
+        @dir = prepare_fixture_directory('exit_during_upgrade')
+        @server_program = File.join(@dir, "exiting_server.rb")
+        @socket_path = File.join(@dir, "einhorn.sock")
+
+        reexec_cmdline = File.join(@dir, 'upgrade_reexec.rb')
+
+        with_running_einhorn(%W{einhorn -m manual -b 127.0.0.1:#{@port} --reexec-as=#{reexec_cmdline} -d #{@socket_path} -- ruby #{@server_program}}) do |process|
+          wait_for_open_port
+
+          Process.kill('USR2', read_from_port.to_i)
+          einhornsh(%W{-d #{@socket_path} -e upgrade})
+
+          client = Einhorn::Client.for_path(@socket_path)
+          client.send_command('command' => 'state')
+          resp = client.receive_message
+
+          state = YAML.load(resp['message'])
+          assert_equal(1, state[:state][:children].count)
+
+          process.terminate
+        end
+      end
+
       describe 'without preloading' do
         it 'can update environment variables when the reexec command line says to' do
           # exec the new einhorn with the same environment:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Greg Brockman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -150,6 +150,8 @@ 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/upgrade_project/upgrading_server.rb
 - test/integration/_lib/helpers.rb
 - test/integration/_lib/helpers/einhorn_helpers.rb
@@ -189,6 +191,8 @@ 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/upgrade_project/upgrading_server.rb
 - test/integration/_lib/helpers.rb
 - test/integration/_lib/helpers/einhorn_helpers.rb