mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-27 10:28:41 -05:00
Fixing repopulate_pool_vms spec tests
This commit is contained in:
parent
57aae90b2a
commit
0126c305ec
2 changed files with 10 additions and 11 deletions
|
|
@ -682,19 +682,14 @@ module Vmpooler
|
|||
end
|
||||
|
||||
def update_pool_size(pool)
|
||||
puts "update_pool_size"
|
||||
mutex = pool_mutex(pool['name'])
|
||||
return if mutex.locked?
|
||||
puts "passed mutex.locked?"
|
||||
poolsize = $redis.hget('vmpooler__config__poolsize', pool['name'])
|
||||
return if poolsize.nil?
|
||||
puts "passed poolsize.nil?"
|
||||
poolsize = Integer(poolsize)
|
||||
return if poolsize == pool['size']
|
||||
puts "passed poolsize == pool['size']"
|
||||
mutex.synchronize do
|
||||
pool['size'] = poolsize
|
||||
puts "passed mutex.synchronize"
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -898,6 +893,9 @@ module Vmpooler
|
|||
|
||||
repopulate_pool_vms(pool['name'], provider, pool_check_response, pool['size'])
|
||||
|
||||
# query redis again until we refactor remove_excess_vms, duplicate of a line moved to refactored method repopulate_pool_vms
|
||||
ready = $redis.scard("vmpooler__ready__#{pool['name']}")
|
||||
total = $redis.scard("vmpooler__pending__#{pool['name']}") + ready
|
||||
# Remove VMs in excess of the configured pool size
|
||||
remove_excess_vms(pool, provider, ready, total)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue