autoscaler 0.6.0 → 0.7.0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.7.0
+
+- Added Autoscaler::LinearScalingStrategy
+- EntireQueuSystem#queued always returns an integer
+
 ## 0.6.0
 
 - Excon errors from the Heroku API are caught be default.  See `HerokuScaler#exception_handler` to override behavior

data/lib/autoscaler/linear_scaling_strategy.rb

@@ -0,0 +1,30 @@
+module Autoscaler
+  # Strategies determine the target number of workers
+  # This strategy sets the number of workers to be proportional to the number of enqueued jobs.
+  class LinearScalingStrategy
+    #@param [integer] workers maximum number of workers to spin up.
+    #@param [integer] worker_capacity the amount of jobs one worker can handle
+    def initialize(workers = 1, worker_capacity = 25)
+      @workers         = workers
+      @worker_capacity = worker_capacity
+    end
+
+    # @param [QueueSystem] system interface to the queuing system
+    # @param [Numeric] event_idle_time number of seconds since a job related event
+    # @return [Integer] target number of workers
+    def call(system, event_idle_time)
+      total_capacity   = (@workers * @worker_capacity).to_f
+      percent_capacity = total_work(system) / total_capacity
+
+      ideal_scale = (percent_capacity * @workers).ceil
+      max_scale   = @workers
+
+      return [ideal_scale, max_scale].min
+    end
+
+    private
+    def total_work(system)
+      system.queued + system.scheduled + system.retrying
+    end
+  end
+end

data/lib/autoscaler/sidekiq/entire_queue_system.rb

@@ -12,7 +12,7 @@ module Autoscaler
 
       # @return [Integer] amount work ready to go
       def queued
-        sidekiq_queues.values.map(&:to_i).reduce(&:+)
+        sidekiq_queues.values.map(&:to_i).reduce(&:+) || 0
       end
 
       # @return [Integer] amount of work scheduled for some time in the future

data/lib/autoscaler/version.rb

@@ -1,4 +1,4 @@
 module Autoscaler
   # version number
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/spec/autoscaler/linear_scaling_strategy_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'test_system'
+require 'autoscaler/linear_scaling_strategy'
+
+describe Autoscaler::LinearScalingStrategy do
+  let(:cut) {Autoscaler::LinearScalingStrategy}
+
+  it "deactivates with no work" do
+    system = TestSystem.new(0)
+    strategy = cut.new(1)
+    strategy.call(system, 1).should == 0
+  end
+
+  it "activates with some work" do
+    system = TestSystem.new(1)
+    strategy = cut.new(1)
+    strategy.call(system, 1).should be > 0
+  end
+
+  it "minimally scales with minimal work" do
+    system = TestSystem.new(1)
+    strategy = cut.new(2, 2)
+    strategy.call(system, 1).should == 1
+  end
+
+  it "maximally scales with too much work" do
+    system = TestSystem.new(5)
+    strategy = cut.new(2, 2)
+    strategy.call(system, 1).should == 2
+  end
+
+  it "proportionally scales with some work" do
+    system = TestSystem.new(5)
+    strategy = cut.new(5, 2)
+    strategy.call(system, 1).should == 3
+  end
+end

data/spec/autoscaler/sidekiq/entire_queue_system_spec.rb

@@ -33,6 +33,10 @@ describe Autoscaler::Sidekiq::EntireQueueSystem do
       subject.queued.should == 0
     end
 
+    it "with no work and no queues" do
+      subject.queued.should == 0
+    end
+
     it "with no scheduled work" do
       subject.scheduled.should == 0
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoscaler
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -121,6 +121,7 @@ files:
 - lib/autoscaler/binary_scaling_strategy.rb
 - lib/autoscaler/delayed_shutdown.rb
 - lib/autoscaler/heroku_scaler.rb
+- lib/autoscaler/linear_scaling_strategy.rb
 - lib/autoscaler/sidekiq/activity.rb
 - lib/autoscaler/sidekiq/celluloid_monitor.rb
 - lib/autoscaler/sidekiq/client.rb
@@ -139,6 +140,7 @@ files:
 - spec/autoscaler/binary_scaling_strategy_spec.rb
 - spec/autoscaler/delayed_shutdown_spec.rb
 - spec/autoscaler/heroku_scaler_spec.rb
+- spec/autoscaler/linear_scaling_strategy_spec.rb
 - spec/autoscaler/sidekiq/activity_spec.rb
 - spec/autoscaler/sidekiq/celluloid_monitor_spec.rb
 - spec/autoscaler/sidekiq/client_spec.rb
@@ -177,6 +179,7 @@ test_files:
 - spec/autoscaler/binary_scaling_strategy_spec.rb
 - spec/autoscaler/delayed_shutdown_spec.rb
 - spec/autoscaler/heroku_scaler_spec.rb
+- spec/autoscaler/linear_scaling_strategy_spec.rb
 - spec/autoscaler/sidekiq/activity_spec.rb
 - spec/autoscaler/sidekiq/celluloid_monitor_spec.rb
 - spec/autoscaler/sidekiq/client_spec.rb