our-eel-hacks 0.0.13 → 0.0.14

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

@@ -99,6 +99,7 @@ module OurEelHacks
       logger.info{ "Autoscaler configured for #{flavor || "{{unknown flavor}}"}"}
 
       update_dynos(dyno_info.count, Time.now)
+      update_scaling_delay(0)
     end
 
     MILLIS_PER_DAY = 24 * 60 * 60 * 1000
@@ -152,7 +153,7 @@ module OurEelHacks
 
       set_dynos(target_dynos, moment)
 
-      break_cadence(starting_wait)
+      update_scaling_delay(starting_wait)
     rescue => ex
       logger.warn{ "Problem scaling: #{ex.inspect} \t#{ex.backtrace.join("\t\n")}" }
     end
@@ -193,15 +194,15 @@ module OurEelHacks
       return 0
     end
 
-    def break_cadence(starting_wait)
+    def update_scaling_delay(starting_wait)
+      @millis_til_next_scale = scaling_frequency * @dynos
       if starting_wait > millis_til_next_scale
-        @millis_til_next_scale = rand((starting_wait..@millis_til_next_scale))
+        @millis_til_next_scale = rand((@millis_til_next_scale..starting_wait))
       end
     end
 
     def update_dynos(new_value, moment)
       if new_value != dynos
-        @millis_til_next_scale = scaling_frequency * new_value
         @last_scaled = moment
         @entered_soft = moment
       end

data/spec/autoscaler.rb

@@ -56,10 +56,19 @@ describe OurEelHacks::Autoscaler do
     Time.now
   end
 
+  before :each do
+    @time_index = 0
+  end
+
   def time_adjust(millis)
+    @time_index = millis
     Time.stub!(:now).and_return(Time.at(starting_time, millis * 1000))
   end
 
+  def time_advance(millis)
+    time_adjust(@time_index + millis)
+  end
+
   let :logger do
     Logger.new($stdout).tap{|lgr| lgr.level = Logger::DEBUG }
   end
@@ -125,6 +134,24 @@ describe OurEelHacks::Autoscaler do
       heroku.should_receive(:ps_scale).with(app_name, hash_including(:qty => 2))
       autoscaler.scale(hard_low)
     end
+
+    it "should adjust its timing to break cadence after scaling down", :pending => "building VCR cassette" do
+      autoscaler.scale(hard_low)
+      autoscaler.millis_til_next_scale.should < expected_scale_frequency
+      autoscaler.millis_til_next_scale.should > 2 * scaling_freq
+
+      time_advance(autoscaler.millis_til_next_scale + 5)
+
+      autoscaler.scale(ideal_value)
+
+      autoscaler.millis_til_next_scale.should == 2 * scaling_freq
+
+      time_advance((2 * scaling_freq) + 5)
+
+      autoscaler.scale(hard_low)
+      autoscaler.millis_til_next_scale.should < 2 * scaling_freq
+      autoscaler.millis_til_next_scale.should > scaling_freq
+    end
   end
 
   describe "soft upper limit" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: our-eel-hacks
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: corundum
-  requirement: &77444910 !ruby/object:Gem::Requirement
+  requirement: &81350710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,22 @@ dependencies:
         version: 0.0.1
   type: :development
   prerelease: false
-  version_requirements: *77444910
+  version_requirements: *81350710
 - !ruby/object:Gem::Dependency
   name: heroku
-  requirement: &77444290 !ruby/object:Gem::Requirement
+  requirement: &81465420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.25.0
+        segments:
+        - 2
+        - 25
+        - 0
   type: :runtime
   prerelease: false
-  version_requirements: *77444290
+  version_requirements: *81465420
 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"
@@ -64,7 +68,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- our-eel-hacks-0.0.13 RDoc
+- our-eel-hacks-0.0.14 RDoc
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -75,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -783417567
+      hash: 962110657
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: