Merge pull request #167 from mattkirby/migrate_at_checkout

Improve vmpooler scheduling logic
puppetlabs · Nov 22, 2016 · 705e5d2 · 705e5d2
2 parents 3e3bc6f + 02327df
commit 705e5d2
Show file tree

Hide file tree

Showing 8 changed files with 517 additions and 284 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,6 +16,7 @@ gem 'statsd-ruby', '>= 1.3.0', :require => 'statsd'
 
 # Test deps
 group :test do
+  gem 'mock_redis', '>= 0.17.0'
   gem 'rack-test', '>= 0.6'
   gem 'rspec', '>= 3.2'
   gem 'simplecov', '>= 0.11.2'

diff --git a/lib/vmpooler/api/v1.rb b/lib/vmpooler/api/v1.rb
@@ -55,6 +55,7 @@ def return_vm_to_ready_state(template, vm)
 
     def account_for_starting_vm(template, vm)
       backend.sadd('vmpooler__running__' + template, vm)
+      backend.sadd('vmpooler__migrating__' + template, vm)
       backend.hset('vmpooler__active__' + template, vm, Time.now)
       backend.hset('vmpooler__vm__' + vm, 'checkout', Time.now)