puppetlabs/vmpooler
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler.git synced 2026-01-27 10:28:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tests and changes to support evaluate_pool

Browse source 
This commit adds tests to support the addition of evaluate_pool in pool_manager. Additionally, tests are updated where appropriate to remove the assumptions of nested loops. Without this change no tests exist for evaluate_pool and tests fail due to the changes.
This commit is contained in:
kirby@puppetlabs.com 2017-04-12 09:22:23 -07:00
parent 3b24446997
commit 0a879dac59
2 changed files with 113 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/vmpooler/pool_manager.rb
View file

@ -26,7 +26,7 @@ module Vmpooler
end
end
def slots_available?(slots, max_slots)
def slots_available(slots, max_slots)
# Returns slots in use unless max is reached
return slots unless slots >= max_slots
end
@ -580,14 +580,14 @@ module Vmpooler
return if checking_pools.include? pool['name']
$redis.sadd('vmpooler__check__pool__pending', pool['name'])
loop_count = 1
while (slots_available?($redis.smembers('vmpooler__check__pool').count, slots.to_i).nil?)
sleep(loop_delay * 3)
while (slots_available($redis.smembers('vmpooler__check__pool').count, slots.to_i).nil?)
sleep(loop_delay)
unless maxloop.zero?
return if loop_count >= maxloop
loop_count += 1
end
end
slots_free = slots_available?($redis.smembers('vmpooler__check__pool').count, slots)
slots_free = slots_available($redis.smembers('vmpooler__check__pool').count, slots)
next_slot = (slots_free.to_i + 1).to_s
check_pool(pool, next_slot)
rescue => err