einhorn 0.7.3 → 0.7.4

data/lib/einhorn.rb

@@ -70,12 +70,6 @@ module Einhorn
         :signal_timeout => nil,
       }
     end
-
-    def self.dumpable_state
-      dump = state
-      dump[:reloading_for_preload_upgrade] = dump[:reloading_for_upgrade]
-      dump
-    end
   end
 
   module TransientState
@@ -110,38 +104,24 @@ module Einhorn
     updated_state = old_state.dup
 
     # Handle changes in state format updates from previous einhorn versions
-    if store == Einhorn::State
-      # TODO: Drop this backwards compatibility hack when we hit 0.7
-      if updated_state.include?(:reloading_for_preload_upgrade) &&
-          !updated_state.include?(:reloading_for_upgrade)
-        updated_state[:reloading_for_upgrade] = updated_state.delete(:reloading_for_preload_upgrade)
-        message << "upgraded :reloading_for_preload_upgrade to :reloading_for_upgrade"
-      end
-
-      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)}
+    if store == Einhorn::State && updated_state[:children]
+      # 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
 
     default = store.default_state

data/lib/einhorn/command.rb

@@ -40,6 +40,8 @@ module Einhorn
       case type = spec[:type]
       when :worker
         Einhorn.log_info("===> Exited worker #{pid.inspect}#{extra}", :upgrade)
+      when :state_passer
+        Einhorn.log_debug("===> Exited state passing process #{pid.inspect}", :upgrade)
       else
         Einhorn.log_error("===> Exited process #{pid.inspect} has unrecgonized type #{type.inspect}: #{spec.inspect}", :upgrade)
       end
@@ -218,6 +220,7 @@ module Einhorn
 
       fork do
         Einhorn::TransientState.whatami = :state_passer
+        Einhorn::State.children[Process.pid] = {type: :state_passer}
         Einhorn::State.generation += 1
         read.close
 

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

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

@@ -40,28 +40,28 @@ module Helpers
           begin
             stdout, stderr = process.communicate
           rescue Errno::ECHILD
-            # It's dead, and we're not getting anything. This is
-            # peaceful.
+            # It's dead, and we're not getting anything. This is peaceful.
           end
         end
         yield(process) if block_given?
-      rescue Exception => e
+      rescue
         unless (status = process.poll) && status.exited?
           process.terminate
         end
         raise
       ensure
         unless (status = process.poll) && status.exited?
-          begin
-            Timeout.timeout(10) do  # (Argh, I'm so sorry)
-              status = process.wait
+          for i in 1..10 do
+            status = process.poll
+            if status && status.exited?
+              break
             end
-          rescue Timeout::Error
+            sleep(1)
+          end
+          unless status && status.exited?
             $stderr.puts "Could not get Einhorn to quit within 10 seconds, killing it forcefully..."
             process.send_signal("KILL")
             status = process.wait
-          rescue Errno::ECHILD
-            # Process is dead!
           end
         end
         communicator.join

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -198,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3456360524100968279
+      hash: 4291999791412545660
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3456360524100968279
+      hash: 4291999791412545660
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23