alicorn 0.0.6 → 0.0.7

data/Gemfile

@@ -7,4 +7,5 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.1.3"
   gem "jeweler", "~> 1.8.3"
+  gem "mocha", "~> 0.11.4"
 end

data/Gemfile.lock

@@ -9,6 +9,9 @@ GEM
       rake
       rdoc
     json (1.7.2)
+    metaclass (0.0.1)
+    mocha (0.11.4)
+      metaclass (~> 0.0.1)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -25,5 +28,6 @@ DEPENDENCIES
   bundler (~> 1.1.3)
   curb (~> 0.8.0)
   jeweler (~> 1.8.3)
+  mocha (~> 0.11.4)
   rdoc (~> 3.12)
   shoulda (~> 3.0.1)

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/alicorn.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "alicorn"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Somers"]
-  s.date = "2012-05-16"
+  s.date = "2012-05-21"
   s.description = "Highly configurable dumb auto-scaler for managing unicorn web servers"
   s.email = "somers.ben@gmail.com"
   s.executables = ["alicorn", "alicorn_profiler"]
@@ -50,12 +50,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<mocha>, ["~> 0.11.4"])
     else
       s.add_dependency(%q<curb>, ["~> 0.8.0"])
       s.add_dependency(%q<shoulda>, ["~> 3.0.1"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.1.3"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<mocha>, ["~> 0.11.4"])
     end
   else
     s.add_dependency(%q<curb>, ["~> 0.8.0"])
@@ -63,6 +65,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.1.3"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<mocha>, ["~> 0.11.4"])
   end
 end
 

data/bin/alicorn

@@ -18,7 +18,7 @@ data sets. \n\nUsage: alicorn [options]"
     options[:min_workers] = v
   end
 
-  opts.on("--max-workers [N]", Integer, "the maximum number of workers to scale up to") do |v|
+  opts.on("--max-workers N", Integer, "the maximum number of workers to scale up to") do |v|
     options[:max_workers] = v
   end
 
@@ -55,4 +55,6 @@ data sets. \n\nUsage: alicorn [options]"
   end
 
 end.parse!
+raise OptionParser::MissingArgument.new("--max-workers is a mandatory argument") unless options[:max_workers]
+
 Alicorn::Scaler.new(options).scale!

data/bin/alicorn_profiler

@@ -14,7 +14,12 @@ to collect statistics about your application load. Then pull that log file
 and feed it into this profiler. Experiment with the options until you find
 settings that work well for you. Be aware that occasional 'Overloaded!' 
 situations are not necessarily bad; they just result in requests getting 
-queued. \n\nUsage: alicorn [options]"
+queued. Note that this profiler is inaccurate in two situations. First, it
+cannot reliably detect a restart (which will reset the worker count, typically
+to max). Second, if the production system is currently running with alicorn in
+dry-run mode, it will not be producing accurate queued counts, which alicorn
+uses to trigger panic responses (which produce fast scale-ups).
+\n\nUsage: alicorn [options]"
     opts.on( '-h', '--help', 'Display this screen' ) do
       puts opts
       exit
@@ -36,6 +41,10 @@ queued. \n\nUsage: alicorn [options]"
     options[:target_ratio] = v
   end
 
+  opts.on("-v", "--[no-]verbose", "turn on to write full sample data on overloads") do
+    options[:verbose] = true
+  end
+
   opts.on("--log-path PATH", String, "location of the alicorn log file to read") do |v|
     options[:log_path] = v
   end
@@ -63,8 +72,9 @@ p "Testing #{@alp.samples.count} samples"
 @alp.samples.each do |sample|
   if sample[:active].max > @worker_count
     p "Overloaded! Ran #{@worker_count} and got #{sample[:active].max} active"
+    p sample if options[:verbose]
   end
-  sig = scaler.send(:auto_scale, sample, @worker_count)
-  @worker_count += 1 if sig == "TTIN"
-  @worker_count -= 1 if sig == "TTOU"
+  sig, count = scaler.send(:auto_scale, sample, @worker_count)
+  @worker_count += count if sig == "TTIN"
+  @worker_count -= count if sig == "TTOU"
 end

data/lib/alicorn/dataset.rb

@@ -1,6 +1,6 @@
 class DataSet < Array
   def avg
-    return nil if empty?
+    return 0 if empty?
     inject(:+) / size.to_i
   end
 

data/lib/alicorn/log_parser.rb

@@ -1,34 +1,30 @@
 module Alicorn
   class LogParser
-    attr_accessor :filename, :samples, :calling, :active, :queued, :calling_avg, :active_avg, :queued_avg
+    attr_accessor :filename, :samples
 
     def initialize(file = "alicorn.log")
       self.filename = file
-      self.samples, self.calling, self.active, self.queued, self.calling_avg, self.active_avg, self.queued_avg = [], [], [], [], [], [], []
+      self.samples  = []
     end
     
     def parse
       f = File.open(filename)
       f.each do |line|
-        if line.match(/"Sampling/)
+       if line.match(/Sampling/)
           @sample_hash = {} # this will reset every sample
-        elsif line.match(/"calling:\[(.+)\]"/)
+        elsif line.match(/calling:\[(.+)\]/)
           data = $1.split(", ").map(&:to_i)
-          calling << data
-          @sample_hash[:calling] = data
-        elsif line.match(/"calling avg:([\d]+)"/)
-          data = $1.to_i
-          calling_avg << data
-          @sample_hash[:calling_avg] = data
-        elsif line.match(/"active:\[(.+)\]"/)
+          @sample_hash[:calling] = (DataSet.new << data).flatten
+        elsif line.match(/writing:\[(.+)\]/)
           data = $1.split(", ").map(&:to_i)
-          active << data
-          @sample_hash[:active] = data
-        elsif line.match(/"active avg:([\d]+)"/)
-          data = $1.to_i
-          active_avg << data
-          @sample_hash[:active_avg] = data
-          samples << @sample_hash
+          @sample_hash[:writing] = (DataSet.new << data).flatten
+        elsif line.match(/active:\[(.+)\]/)
+          data = $1.split(", ").map(&:to_i)
+          @sample_hash[:active] = (DataSet.new << data).flatten
+        elsif line.match(/queued:\[(.+)\]/)
+          data = $1.split(", ").map(&:to_i)
+          @sample_hash[:queued] = (DataSet.new << data).flatten
+          samples << @sample_hash # store the old sample
         end
       end
     end

data/lib/alicorn/scaler.rb

@@ -5,14 +5,15 @@ require 'alicorn/dataset'
 module Alicorn
   class Scaler
     attr_accessor :min_workers, :max_workers, :target_ratio, :buffer,
-      :raindrops_url, :delay, :sample_count, :app_name, :dry_run,
-      :master_pid, :worker_count, :logger
+      :raindrops_url, :delay, :sample_count, :app_name, :dry_run, :logger
+
+    def initialize(options = {})
+      raise ArgumentError.new("You must pass a :max_workers option") unless options[:max_workers]
 
-    def initialize(options)
       self.min_workers        = options[:min_workers]         || 1
       self.max_workers        = options[:max_workers]
       self.target_ratio       = options[:target_ratio]        || 1.3
-      self.buffer             = options[:buffer]              || 0
+      self.buffer             = options[:buffer]              || 2
       self.raindrops_url      = options[:url]                 || "http://127.0.0.1/_raindrops"
       self.delay              = options[:delay]               || 1
       self.sample_count       = options[:sample_count]        || 30
@@ -25,18 +26,25 @@ module Alicorn
     end
 
     def scale!
-      master_pid    = find_master_pid
-      worker_count  = find_worker_count
       data          = collect_data
+      unicorns      = find_unicorns
+      master_pid    = find_master_pid(unicorns)
+      worker_count  = find_worker_count(unicorns)
 
-      sig = auto_scale(data, worker_count)
-      send_signal(sig) if sig
+      sig, number = auto_scale(data, worker_count)
+      if sig and !dry_run
+        number.times do
+          send_signal(master_pid, sig) 
+          sleep(1) # Make sure unicorn doesn't discard repeated signals
+        end
+      end
     end
 
   protected
 
     def auto_scale(data, worker_count)
       return nil if data[:active].empty?
+
       # Calculate target
       target = data[:active].max * target_ratio + buffer
 
@@ -46,23 +54,42 @@ module Alicorn
       target = target.ceil
 
       logger.debug "target calculated at: #{target}, worker count at #{worker_count}"
-      if target > worker_count
-        logger.debug "scaling up!" unless dry_run
-        return "TTIN"
+      if data[:active].avg > worker_count and data[:queued].avg > 1
+        logger.debug "danger, will robinson! scaling up fast!"
+        return "TTIN", target - worker_count
+      elsif target > worker_count
+        logger.debug "scaling up!"
+        return "TTIN", 1
       elsif target < worker_count
-        logger.debug "scaling down!" unless dry_run
-        return "TTOU"
+        logger.debug "scaling down!"
+        return "TTOU", 1
+      elsif target == worker_count
+        logger.debug "just right!"
+        return nil, 0
+      end
+    end
+
+    def find_master_pid(unicorns)
+      master_lines = unicorns.select { |line| line.match /master/ }
+      if master_lines.size > 1
+        abort "Too many unicorn master processes detected. You may be restarting, or have an app name collision: #{master_lines}"
+      elsif master_lines.first.match /\(old\)/
+        abort "Old master process detected. You may be restarting: #{master_lines.first}"
+      else
+        master_lines.first.split.first
       end
     end
 
-    def find_master_pid
+    def find_worker_count(unicorns)
+      unicorns.select { |line| line.match /worker\[[\d]\]/ }.count
     end
 
-    def find_worker_count
-      14
+    def find_unicorns
+      ptable = %x(ps ax).split("\n")
+      unicorns = ptable.select { |line| line.match(/unicorn/) && line.match(/#{Regexp.escape(app_name)}/) }
+      unicorns.map(&:strip)
     end
 
-  private
 
     def collect_data
       logger.debug "Sampling #{sample_count} times"
@@ -75,30 +102,25 @@ module Alicorn
         queued  << $1.to_i if raindrops.detect { |line| line.match(/queued: ([0-9]+)/) }
         sleep(delay)
       end
+
       logger.debug "Collected:"
       logger.debug "calling:#{calling}"
-      logger.debug "calling avg:#{calling.avg}"
-      logger.debug "calling stddev:#{calling.stddev}"
       logger.debug "writing:#{writing}"
-      logger.debug "writing avg:#{writing.avg}"
-      logger.debug "writing stddev:#{writing.stddev}"
       logger.debug "active:#{active}"
-      logger.debug "active avg:#{active.avg}"
-      logger.debug "active stddev:#{active.stddev}"
       logger.debug "queued:#{queued}"
-      logger.debug "queued avg:#{queued.avg}"
-      logger.debug "queued stddev:#{queued.stddev}"
+
       {:calling => calling, :writing => writing, :active => active, :queued => queued}
     end
 
+    def send_signal(master_pid, sig)
+      Process.kill(sig, master_pid)
+    end
+
+private
+
     def get_raindrops(url)
       Curl::Easy.http_get(url).body_str.split("\n")
     end
     
-    def send_signal(sig)
-      return false if dry_run
-      return sig
-      # Process.kill(sig, master_pid)
-    end
   end
 end

data/test/helper.rb

@@ -9,11 +9,11 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'alicorn'
-require 'script/al'
 
 class Test::Unit::TestCase
 end

data/test/test_alicorn.rb

@@ -2,8 +2,86 @@ require 'helper'
 
 class TestScaler < Test::Unit::TestCase
 
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  def setup
+    @scaler = Alicorn::Scaler.new(:delay => 0)
+    class << @scaler
+      def publicize(method)
+        self.class.class_eval { public method }
+      end
+    end
+  end
+
+  context "#auto_scale" do
+    setup do
+      @scaler.publicize :auto_scale
+      @worker_count = 10
+      @scaler.min_workers = 1
+      @scaler.max_workers = 25
+      @scaler.buffer = 2
+      @scaler.target_ratio = 1.3
+      @data = { :active => DataSet.new,
+                :queued => DataSet.new }
+      @data[:queued] << 0
+    end
+
+    context "when we're above the target" do
+      setup do
+        @data[:active] << 3 << 4 << 5
+      end
+
+      should "return 1 TTOU" do
+        assert_equal ["TTOU", 1], @scaler.auto_scale(@data, @worker_count)
+      end
+    end
+
+    context "when we're below the target" do
+      setup do
+        @data[:active] << 2 << 10
+      end
+
+      should "return 1 TTIN" do
+        assert_equal ["TTIN", 1], @scaler.auto_scale(@data, @worker_count)
+      end
+    end
+
+    context "when we need to scale up fast" do
+      setup do
+        @data[:queued] << 12
+        @data[:active] << 12
+      end
+
+      should "return several TTIN" do
+        assert_equal ["TTIN", 8], @scaler.auto_scale(@data, @worker_count)
+      end
+    end
+
+    context "when we don't need to scale at all" do
+      setup do
+        @data[:active] << 6
+      end
+
+      should "return several TTIN" do
+        assert_equal [nil, 0], @scaler.auto_scale(@data, @worker_count)
+      end
+    end
+
+  end
+
+  context "#collect_data" do
+    setup do
+      @scaler.publicize :collect_data
+      raindrops = "calling: 3\nwriting: 1\n/tmp/cart.socket active: 4\n/tmp/cart.socket queued: 0\n"
+      Curl::Easy.stubs(:http_get).returns(stub(:body_str => raindrops))
+    end
+
+    should "return the correct data" do
+      data = @scaler.collect_data
+      expected_data = { :calling => [3]*30,
+                        :writing => [1]*30,
+                        :active  => [4]*30,
+                        :queued  => [0]*30 }
+      assert_equal expected_data, data
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70324496613000 !ruby/object:Gem::Requirement
+  requirement: &70323769373580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70324496613000
+  version_requirements: *70323769373580
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70324496612520 !ruby/object:Gem::Requirement
+  requirement: &70323769373060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70324496612520
+  version_requirements: *70323769373060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70324496611760 !ruby/object:Gem::Requirement
+  requirement: &70323769372560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70324496611760
+  version_requirements: *70323769372560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70324496611060 !ruby/object:Gem::Requirement
+  requirement: &70323769371920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70324496611060
+  version_requirements: *70323769371920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70324496610220 !ruby/object:Gem::Requirement
+  requirement: &70323769371300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,18 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70324496610220
+  version_requirements: *70323769371300
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &70323769370440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.11.4
+  type: :development
+  prerelease: false
+  version_requirements: *70323769370440
 description: Highly configurable dumb auto-scaler for managing unicorn web servers
 email: somers.ben@gmail.com
 executables:
@@ -107,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4528028483231414856
+      hash: 136029821414189245
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: