our-eel-hacks 0.0.15 → 0.0.16

data/lib/our-eel-hacks/autoscaler.rb

@@ -1,4 +1,4 @@
-require 'heroku'
+require 'our-eel-hacks/heroku-client'
 
 module OurEelHacks
   class NullLogger
@@ -132,8 +132,11 @@ module OurEelHacks
     end
 
     API_CALLS_PER_SCALE = 2
-    def scale(metric)
-      logger.debug{ "Scaling request for #{@ps_type}: metric is: #{metric}" }
+    def scale(metric_hash)
+      logger.debug{ "Scaling request for #{@ps_type}: metrics are: #{metric_hash.inspect}" }
+
+      #TODO: multi-metric scaling logic
+      metric = metric_hash.to_a.last.last #Yeah, this is awful
       moment = Time.now
       if elapsed(last_scaled, moment) < millis_til_next_scale
         logger.debug{ "Not scaling: elapsed #{elapsed(last_scaled, moment)} less than computed #{millis_til_next_scale}" }
@@ -232,11 +235,7 @@ module OurEelHacks
     end
 
     def heroku
-      @heroku ||= Heroku::Client.new("", heroku_api_key).tap do |client|
-        unless client.info(app_name)[:stack] == "cedar"
-          raise "#{self.class.name} built against cedar stack"
-        end
-      end
+      @heroku ||= HerokuClient.new(logger, "", heroku_api_key)
     end
 
     def set_dynos(count,moment)

data/lib/our-eel-hacks/rack.rb

@@ -4,15 +4,15 @@ module OurEelHacks
   class Rack < Middleware
     include Defer::EventMachine
 
-    def initialize(app, env_field, flavor = :web)
+    def initialize(app, env_fields, flavor = :web)
       super(flavor)
-      @env_field = env_field
+      @env_fields = [*env_fields].map(&:to_s)
       @app = app
     end
 
     def call(env)
       begin
-        autoscale(metric_from(env))
+        autoscale(metrics_from(env))
       rescue => ex
         puts "Problem in autoscaling: #{ex.inspect}"
       end
@@ -20,10 +20,10 @@ module OurEelHacks
       @app.call(env)
     end
 
-    def metric_from(env)
-      (Integer(env[@env_field]) rescue 0).tap{|val|
-        puts "#{@env_field} => #{env[@env_field]} : #{val}"
-      }
+    def metrics_from(env)
+      Hash[ @env_fields.map do |field|
+        [field, (Integer(env[field]) rescue 0)]
+      end ]
     end
   end
 

data/lib/our-eel-hacks/sidekiq.rb

@@ -10,7 +10,7 @@ module OurEelHacks
 
     def call(worker_class, item, queue)
       begin
-        autoscale(get_queue_length(queue).tap{|length| puts "Queue length: #{length}"})
+        autoscale(get_queue_length(queue))
       rescue => ex
         puts "Problem in autoscaling: #{ex.inspect}"
       end
@@ -18,9 +18,9 @@ module OurEelHacks
     end
 
     def get_queue_length(queue)
-      ::Sidekiq.redis do |conn|
+      {"queue_length" => ::Sidekiq.redis do |conn|
         conn.llen("queue:#{queue}") || 0
-      end
+      end }
     end
   end
 end

data/spec/autoscaler.rb

@@ -25,23 +25,23 @@ describe OurEelHacks::Autoscaler do
   end
 
   let :ideal_value do
-    25
+    { "metric" => 25 }
   end
 
   let :soft_high do
-    35
+    { "metric" => 35 }
   end
 
   let :soft_low do
-    3
+    { "metric" => 3 }
   end
 
   let :hard_high do
-    100
+    { "metric" => 100 }
   end
 
   let :hard_low do
-    -10
+    { "metric" => -10 }
   end
 
   let :dyno_count do
@@ -89,6 +89,8 @@ describe OurEelHacks::Autoscaler do
         test.upper_limits.soft = 30
         test.upper_limits.hard = 50
 
+        #JDL: useful for debugging spec fails
+        #Irritating in general use
         #test.logger = logger
       end
     end
@@ -103,17 +105,26 @@ describe OurEelHacks::Autoscaler do
   end
 
   before :each do
+    OurEelHacks::HerokuClient.processing_budget = 3
     heroku.stub!(:ps_scale)
     time_adjust(0)
     autoscaler.scale(ideal_value)
   end
 
+  def no_requests
+    OurEelHacks::HerokuClient.processing_budget = 0
+    heroku.should_not_receive(:ps_scale)
+  end
+
   describe "scaling frequency" do
 
     it "should not scale too soon" do
       time_adjust(expected_scale_frequency - 5)
 
-      heroku.should_not_receive(:ps_scale)
+      no_requests
+      autoscaler.scale(hard_high)
+      autoscaler.scale(hard_high)
+      autoscaler.scale(hard_high)
       autoscaler.scale(hard_high)
     end
 
@@ -163,15 +174,19 @@ describe OurEelHacks::Autoscaler do
     describe "if soft_duration hasn't elapsed" do
       before :each do
         time_adjust((expected_scale_frequency * 2) + soft_dur - 5)
-        heroku.should_not_receive(:ps_scale)
+        no_requests
       end
 
       it "should not scale up" do
         autoscaler.scale(soft_high)
+        autoscaler.scale(soft_high)
+        autoscaler.scale(soft_high)
       end
 
       it "should not scale down" do
         autoscaler.scale(soft_low)
+        autoscaler.scale(soft_high)
+        autoscaler.scale(soft_high)
       end
     end
 

data/spec/rack.rb

@@ -12,6 +12,7 @@ describe OurEelHacks::Rack do
   end
 
   before :each do
+    OurEelHacks::HerokuClient.processing_budget = 3
     OurEelHacks::Autoscaler.configure(:test) do |test|
       test.app_name = app_name
       test.heroku_api_key = api_key
@@ -35,7 +36,7 @@ describe OurEelHacks::Rack do
 
 
   it "should pass the metric to the autoscaler" do
-    OurEelHacks::Autoscaler.instance_for(:test).should_receive(:scale).with(100)
+    OurEelHacks::Autoscaler.instance_for(:test).should_receive(:scale).with({env_field => 100})
     middleware.call({env_field => "100"})
   end
 end

data/spec_help/spec_helper.rb

@@ -12,6 +12,23 @@ RSpec.configure do |config|
   config.extend VCR::RSpec::Macros
 end
 
+require 'our-eel-hacks/heroku-client'
+class OurEelHacks::HerokuClient
+  alias real_process process
+
+  class << self
+    attr_accessor :processing_budget
+  end
+
+  def process(*args, &block)
+    #puts caller.grep %r{#{File::expand_path("../..",__FILE__)}}
+    if (self.class.processing_budget -= 1) < 0
+      raise "Exhausted processing budget"
+    end
+    real_process(*args, &block)
+  end
+end
+
 $" << "eventmachine"
 
 module EventMachine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: our-eel-hacks
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &76665630 !ruby/object:Gem::Requirement
+  requirement: &71944990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *76665630
+  version_requirements: *71944990
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &76675340 !ruby/object:Gem::Requirement
+  requirement: &71940420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -36,7 +36,7 @@ dependencies:
         - 0
   type: :runtime
   prerelease: false
-  version_requirements: *76675340
+  version_requirements: *71940420
 description: ! "  Middleware for Rack and Sidekiq to scale heroku.\n\n  A heroku process
   knows everything it needs in order to scale itself.  A little configuration, and
   you're set.\n"
@@ -68,7 +68,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- our-eel-hacks-0.0.15 RDoc
+- our-eel-hacks-0.0.16 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 711289331
+      hash: -980070001
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: