alicorn 0.0.9 → 0.0.10

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/alicorn.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "alicorn"
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Somers"]
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
     "lib/alicorn/log_parser.rb",
     "lib/alicorn/scaler.rb",
     "test/helper.rb",
-    "test/test_alicorn.rb"
+    "test/test_scaler.rb"
   ]
   s.homepage = "http://github.com/bensomers/alicorn"
   s.licenses = ["MIT"]

data/bin/alicorn_profiler

@@ -70,8 +70,9 @@ scaler = Alicorn::Scaler.new(@options)
 
 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"
+  connections = sample[:active].zip(sample[:queued]).map { |e| e.inject(:+) }
+  if connections.max > @worker_count
+    p "Overloaded! Ran #{@worker_count} and got #{connections.max} active + queued"
     p sample if options[:verbose]
   end
   sig, count = scaler.send(:auto_scale, sample, @worker_count)

data/lib/alicorn/scaler.rb

@@ -8,8 +8,6 @@ module Alicorn
       :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]
-
       self.min_workers        = options[:min_workers]         || 1
       self.max_workers        = options[:max_workers]
       self.target_ratio       = options[:target_ratio]        || 1.3
@@ -28,6 +26,8 @@ module Alicorn
     def scale!
       data          = collect_data
       unicorns      = find_unicorns
+
+      abort "Could not find any unicorn processes" if unicorns.empty?
       master_pid    = find_master_pid(unicorns)
       worker_count  = find_worker_count(unicorns)
 
@@ -43,10 +43,12 @@ module Alicorn
   protected
 
     def auto_scale(data, worker_count)
-      return nil if data[:active].empty?
+      return nil if data[:active].empty? or data[:queued].empty?
+      connections = data[:active].zip(data[:queued]).map { |e| e.inject(:+) }
+      connections = DataSet.new(connections)
 
       # Calculate target
-      target = data[:active].max * target_ratio + buffer
+      target = connections.max * target_ratio + buffer
 
       # Check hard thresholds
       target = max_workers if max_workers and target > max_workers
@@ -54,7 +56,7 @@ module Alicorn
       target = target.ceil
 
       logger.debug "target calculated at: #{target}, worker count at #{worker_count}"
-      if data[:active].avg > worker_count and data[:queued].avg > 1
+      if connections.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
@@ -90,7 +92,6 @@ module Alicorn
       unicorns.map(&:strip)
     end
 
-
     def collect_data
       logger.debug "Sampling #{sample_count} times"
       calling, writing, active, queued = DataSet.new, DataSet.new, DataSet.new, DataSet.new

data/test/{test_alicorn.rb → test_scaler.rb}

@@ -11,6 +11,17 @@ class TestScaler < Test::Unit::TestCase
     end
   end
 
+  context "#scale!" do
+    context "when no unicorn processes are running" do
+    end
+    context "when multiple master processes are found" do
+    end
+    context "when an old master process is running" do
+    end
+    context "when things are properly detected" do
+    end
+  end
+
   context "#auto_scale" do
     setup do
       @scaler.publicize :auto_scale
@@ -21,12 +32,13 @@ class TestScaler < Test::Unit::TestCase
       @scaler.target_ratio = 1.3
       @data = { :active => DataSet.new,
                 :queued => DataSet.new }
-      @data[:queued] << 0
+      @data[:queued]
     end
 
     context "when we're above the target" do
       setup do
         @data[:active] << 3 << 4 << 5
+        @data[:queued] << 0 << 0 << 0
       end
 
       should "return 1 TTOU" do
@@ -37,6 +49,7 @@ class TestScaler < Test::Unit::TestCase
     context "when we're below the target" do
       setup do
         @data[:active] << 2 << 10
+        @data[:queued] << 0 << 0
       end
 
       should "return 1 TTIN" do
@@ -46,8 +59,8 @@ class TestScaler < Test::Unit::TestCase
 
     context "when we need to scale up fast" do
       setup do
-        @data[:queued] << 12
-        @data[:active] << 12
+        @data[:queued] << 6
+        @data[:active] << 6
       end
 
       should "return several TTIN" do
@@ -58,6 +71,7 @@ class TestScaler < Test::Unit::TestCase
     context "when we don't need to scale at all" do
       setup do
         @data[:active] << 6
+        @data[:queued] << 0
       end
 
       should "return several TTIN" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alicorn
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &70148028920780 !ruby/object:Gem::Requirement
+  requirement: &70103116675180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70148028920780
+  version_requirements: *70103116675180
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70148028920280 !ruby/object:Gem::Requirement
+  requirement: &70103116673500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :development
   prerelease: false
-  version_requirements: *70148028920280
+  version_requirements: *70103116673500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70148028919760 !ruby/object:Gem::Requirement
+  requirement: &70103116672420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70148028919760
+  version_requirements: *70103116672420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70148028919180 !ruby/object:Gem::Requirement
+  requirement: &70103116671500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70148028919180
+  version_requirements: *70103116671500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70148028918580 !ruby/object:Gem::Requirement
+  requirement: &70103116670920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70148028918580
+  version_requirements: *70103116670920
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70148028917880 !ruby/object:Gem::Requirement
+  requirement: &70103116670380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *70148028917880
+  version_requirements: *70103116670380
 description: Highly configurable dumb auto-scaler for managing unicorn web servers
 email: somers.ben@gmail.com
 executables:
@@ -102,7 +102,7 @@ files:
 - lib/alicorn/log_parser.rb
 - lib/alicorn/scaler.rb
 - test/helper.rb
-- test/test_alicorn.rb
+- test/test_scaler.rb
 homepage: http://github.com/bensomers/alicorn
 licenses:
 - MIT
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2489320391573098052
+      hash: -225078698717891469
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: