einhorn 0.5.6 → 0.5.7

data/Gemfile

@@ -4,5 +4,8 @@
  eval(File.read(path), binding, path); break true
 end || source('https://rubygems.org/')
 
+# Only needed for examples
+gem 'thin-attach_socket'
+
 # Specify your gem's dependencies in einhorn.gemspec
 gemspec

data/README.md

@@ -238,11 +238,8 @@ servers) to a wider array of applications.
 See https://stripe.com/blog/meet-einhorn for more background.
 
 Stripe currently uses Einhorn in production for a number of
-services. Our Thin + EventMachine servers currently require patches to
-both Thin and EventMachine (to support file-descriptor passing). You
-can obtain these patches from our public forks of the
-[respective](https://github.com/stripe/thin)
-[projects](https://github.com/stripe/eventmachine). Check out
+services. You can use Conrad Irwin's thin-attach_socket gem along with
+EventMachine-LE to support file-descriptor passing. Check out
 `example/thin_example` for an example of running Thin under Einhorn.
 
 ## Compatibility

data/example/thin_example

@@ -9,11 +9,9 @@
 require 'rubygems'
 require 'einhorn'
 
-# Make sure we're using the patched versions.
-gem 'thin', '1.3.2.stripe.0'
-gem 'eventmachine', '1.0.0.beta.4.stripe.0'
-
+require 'eventmachine-le'
 require 'thin'
+require 'thin/attach_socket'
 
 class App
   def initialize(id)
@@ -42,7 +40,9 @@ def einhorn_main
   EventMachine.run do
     (0...fd_count).each do |i|
       sock = Einhorn::Worker.socket!(i)
-      srv = Thin::Server.new(sock, App.new(i), :reuse => true)
+      srv = Thin::Server.new(App.new(i),
+        :backend => Thin::Backends::AttachSocket,
+        :socket => IO.for_fd(sock))
       srv.start
     end
   end

data/lib/einhorn/command.rb

@@ -152,6 +152,24 @@ module Einhorn
       output
     end
 
+    def self.set_workers(new)
+      if new == Einhorn::State.config[:number]
+        return ""
+      end
+
+      Einhorn::Event.break_loop
+      old = Einhorn::State.config[:number]
+      Einhorn::State.config[:number] = new
+      output = "Altering worker count, #{old} -> #{new}. Will "
+      if old < new
+        output << "spin up additional workers."
+      else
+        output << "gracefully terminate workers."
+      end
+      $stderr.puts(output)
+      output
+    end
+
     def self.dumpable_state
       global_state = Einhorn::State.state
       descriptor_state = Einhorn::Event.persistent_descriptors.map do |descriptor|
@@ -220,8 +238,16 @@ module Einhorn
       end
     end
 
+    def self.next_index
+      all_indexes = Set.new(Einhorn::State.children.map { |k, st| st[:index] })
+      0.upto(all_indexes.length) do |i|
+        return i unless all_indexes.include?(i)
+      end
+    end
+
     def self.spinup(cmd=nil)
       cmd ||= Einhorn::State.cmd
+      index = next_index
       if Einhorn::TransientState.preloaded
         pid = fork do
           Einhorn::TransientState.whatami = :worker
@@ -234,7 +260,7 @@ module Einhorn
 
           reseed_random
 
-          prepare_child_environment
+          prepare_child_environment(index)
           einhorn_main
         end
       else
@@ -251,17 +277,18 @@ module Einhorn
           # Note that Ruby 1.9's close_others option is useful here.
           Einhorn::Event.close_all_for_worker
 
-          prepare_child_environment
+          prepare_child_environment(index)
           Einhorn::Compat.exec(cmd[0], cmd[1..-1], :close_others => false)
         end
       end
 
-      Einhorn.log_info("===> Launched #{pid}", :upgrade)
+      Einhorn.log_info("===> Launched #{pid} (index: #{index})", :upgrade)
       Einhorn::State.children[pid] = {
         :type => :worker,
         :version => Einhorn::State.version,
         :acked => false,
-        :signaled => Set.new
+        :signaled => Set.new,
+        :index => index
       }
       Einhorn::State.last_spinup = Time.now
 
@@ -276,7 +303,7 @@ module Einhorn
       end
     end
 
-    def self.prepare_child_environment
+    def self.prepare_child_environment(index)
       # This is run from the child
       ENV['EINHORN_MASTER_PID'] = Process.ppid.to_s
       ENV['EINHORN_SOCK_PATH'] = Einhorn::Command::Interface.socket_path
@@ -289,6 +316,8 @@ module Einhorn
       ENV['EINHORN_FD_COUNT'] = Einhorn::State.bind_fds.length.to_s
       Einhorn::State.bind_fds.each_with_index {|fd, i| ENV["EINHORN_FD_#{i}"] = fd.to_s}
 
+      ENV['EINHORN_CHILD_INDEX'] = index.to_s
+
       # EINHORN_FDS is deprecated. It was originally an attempt to
       # match Upstart's nominal internal support for space-separated
       # FD lists, but nobody uses that in practice, and it makes

data/lib/einhorn/command/interface.rb

@@ -328,6 +328,21 @@ EOF
       Einhorn::Command.decrement
     end
 
+    command 'set_workers', 'Set the number of Einhorn child processes' do |conn, request|
+      args = request['args']
+      if message = validate_args(args)
+        next message
+      end
+
+      count = args[0].to_i
+      if count < 1 || count > 100
+        # sancheck. 100 is kinda arbitrary.
+        next "Invalid count: '#{args[0]}'. Must be an integer in [1,100)."
+      end
+
+      Einhorn::Command.set_workers(count)
+    end
+
     command 'quieter', 'Decrease verbosity' do
       Einhorn::Command.quieter
     end

data/lib/einhorn/version.rb

@@ -1,3 +1,3 @@
 module Einhorn
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/lib/einhorn/worker.rb

@@ -33,6 +33,23 @@ module Einhorn
       end
     end
 
+    # Returns the index of this Einhorn child process.
+    #
+    # If an Einhorn master has N children, this will be an integer in
+    # the range [0,N), and no two workers running concurrently will
+    # ever have the same index.
+    #
+    # Returns nil if not running in Einhorn, or running on a version
+    # of Einhorn that does not support indexing children.
+    def self.einhorn_child_index
+      index = ENV['EINHORN_CHILD_INDEX']
+      if index.nil? || index !~ /\A \d+ \z/x
+        index
+      else
+        index.to_i
+      end
+    end
+
     # Call this once your app is up and running in a good state.
     # Arguments:
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einhorn
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,21 +164,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2873954184645788574
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2873954184645788574
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: ! 'Einhorn: the language-independent shared socket manager'
@@ -190,3 +184,4 @@ test_files:
 - test/unit/einhorn/command/interface.rb
 - test/unit/einhorn/event.rb
 - test/unit/einhorn/worker_pool.rb
+has_rdoc: