autoscaler 0.2.0 → 0.2.1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.1
+
+- Separate background activity flags to avoid crosstalk between processes
+- Autoscaler::StubScaler may be used for local testing
+
 ## 0.2.0
 
 - Raise minimum Sidekiq version to 2.6.1 to take advantage of Stats API
@@ -17,6 +22,6 @@
 
 ## 0.0.2
 
-- Loosen Sidekiq version dependecy
+- Loosen Sidekiq version dependency
 - Add changelog
 - Add changelog, readme, and examples to gem files list

data/Guardfile

@@ -2,9 +2,11 @@ guard 'process', :name => 'redis', :command => 'redis-server spec/redis_test.con
   watch('spec/redis_test.conf')
 end
 
+tag = "--tag #{ENV['TAG']}" if ENV['TAG']
+example = "-e '#{ENV['EXAMPLE']}'" if ENV['EXAMPLE']
 guard 'rspec',
     :version => 2,
-    :cli => '--color --format d',
+    :cli => "--color --format d #{tag} #{example}",
     :bundler => false,
     :spec_paths => ['spec'] do
   watch(%r{^spec/.+_spec\.rb$})

data/README.md

@@ -8,11 +8,11 @@ Tested on Ruby 1.9.2 and Heroku Cedar stack.
 
 ## Installation
 
-    gem install sidekiq
+    gem install autoscaler
 
 ## Getting Started
 
-This gem uses the [Herkou-Api](https://github.com/heroku/heroku.rb) gem, which requires an API key from Heroku.  It will also need the heroku app name.  By default, these are specified through environment variables.  You can also pass them to HerkouScaler explicitly.
+This gem uses the [Herkou-Api](https://github.com/heroku/heroku.rb) gem, which requires an API key from Heroku.  It will also need the heroku app name.  By default, these are specified through environment variables.  You can also pass them to HerokuScaler explicitly.
 
     HEROKU_API_KEY=.....
     HEROKU_APP=....
@@ -38,6 +38,7 @@ Install the middleware in your `Sidekiq.configure_` blocks
 - Workers sleep-loop and are not actually returned to the pool; when a job or timeout happen, they can all release at once.
 - If you set job-timeouts on your tasks, they will likely trigger on the sleep-loop (see previous).
 - The retry and schedule lists are considered - if you schedule a long-running task, the process will not scale-down.
+- If background jobs trigger jobs in other scaled processes, please note you'll need `config.client_middleware` in your `Sidekiq.configure_server` block in order to scale-up.
 
 ### Long Jobs
 

data/lib/autoscaler/sidekiq.rb

@@ -33,10 +33,10 @@ module Autoscaler
 
       # Sidekiq middleware api entry point
       def call(worker, msg, queue)
-        working!
+        working!(queue)
         yield
       ensure
-        working!
+        working!(queue)
         wait_for_task_or_scale
       end
 
@@ -81,21 +81,34 @@ module Autoscaler
         end
       end
 
-      def working!
-        ::Sidekiq.redis {|c| c.set('background_activity', Time.now)}
+      def working!(queue)
+        active_at queue, Time.now
+      end
+
+      # test support
+      def idle!(queue)
+        active_at queue, Time.now - @timeout*2
       end
 
       def idle_time
-        ::Sidekiq.redis {|c|
-          t = c.get('background_activity')
-          return 0 unless t
-          Time.now - Time.parse(t)
-        }
+        t = last_activity
+        return 0 unless t
+        Time.now - Time.parse(t)
       end
 
       def idle?
         idle_time > @timeout
       end
+
+      def last_activity
+        ::Sidekiq.redis {|c|
+          queue_names.map {|q| c.get('background_activity:'+q)}.compact.max
+        }
+      end
+
+      def active_at(queue, time)
+        ::Sidekiq.redis {|c| c.set('background_activity:'+queue, time)}
+      end
     end
   end
 end

data/lib/autoscaler/version.rb

@@ -1,4 +1,4 @@
 module Autoscaler
   # version number
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/autoscaler/sidekiq_spec.rb

@@ -9,6 +9,11 @@ class Scaler
   end
 end
 
+class Autoscaler::Sidekiq::Server
+  public :idle!
+  public :working!
+end
+
 describe Autoscaler::Sidekiq do
   before do
     @redis = Sidekiq.redis = REDIS
@@ -91,6 +96,15 @@ describe Autoscaler::Sidekiq do
         end
         when_run_should_scale
       end
+
+      context "when another process is working" do
+        let(:other_process) {cut.new(Scaler.new(0), 10, ['other_queue'])}
+        before do
+          other_process.idle!('other_queue')
+          server.working!('queue')
+        end
+        it {other_process.should be_idle}
+      end
     end
 
     describe 'does not scale' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: autoscaler
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-29 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq