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

Move to using redis to track the ondemand clone task count so it can be displayed by dashboard and API

Browse source
This commit is contained in:
kirby@puppetlabs.com 2020-05-11 18:22:54 -07:00
parent 4de3490bfe
commit 8459e2ec21
4 changed files with 15 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/vmpooler/api/helpers.rb
View file

@ -238,7 +238,7 @@ module Vmpooler
queue[:running] = get_total_across_pools_redis_scard(pools, 'vmpooler__running__', backend)
queue[:completed] = get_total_across_pools_redis_scard(pools, 'vmpooler__completed__', backend)
queue[:cloning] = backend.get('vmpooler__tasks__clone').to_i
queue[:cloning] = backend.get('vmpooler__tasks__clone').to_i + backend.get('vmpooler__tasks__ondemandclone').to_i
queue[:booting] = queue[:pending].to_i - queue[:cloning].to_i
queue[:booting] = 0 if queue[:booting] < 0
queue[:total] = queue[:pending].to_i + queue[:ready].to_i + queue[:running].to_i + queue[:completed].to_i

23
lib/vmpooler/pool_manager.rb
View file

@ -35,9 +35,6 @@ module Vmpooler
# Name generator for generating host names
@name_generator = Spicy::Proton.new
@tasks = Concurrent::Hash.new
@tasks['ondemand_clone_count'] = 0
# load specified providers from config file
load_used_providers
end
@ -403,12 +400,9 @@ module Vmpooler
end
raise
ensure
if request_id
@tasks['ondemand_clone_count'] -= 1
else
@redis.with_metrics do |redis|
redis.decr('vmpooler__tasks__clone')
end
@redis.with_metrics do |redis|
redis.decr('vmpooler__tasks__ondemandclone') if request_id
redis.decr('vmpooler__tasks__clone') unless request_id
end
end
end
@ -1443,26 +1437,26 @@ module Vmpooler
queue_key = 'vmpooler__odcreate__task'
queue = redis.zrange(queue_key, 0, -1, with_scores: true)
ondemand_clone_limit = $config[:config]['ondemand_clone_limit']
@tasks['ondemand_clone_count'] = 0 unless @tasks['ondemand_clone_count']
queue.each do |request, score|
break unless @tasks['ondemand_clone_count'] < ondemand_clone_limit
clone_count = redis.get('vmpooler__tasks__ondemandclone').to_i
break unless clone_count < ondemand_clone_limit
pool_alias, pool, count, request_id = request.split(':')
count = count.to_i
provider = get_provider_for_pool(pool)
slots = ondemand_clone_limit - @tasks['ondemand_clone_count']
slots = ondemand_clone_limit - clone_count
break if slots == 0
if slots >= count
count.times do
@tasks['ondemand_clone_count'] += 1
redis.incr('vmpooler__tasks__ondemandclone')
clone_vm(pool, provider, request_id, pool_alias)
end
redis.zrem(queue_key, request)
else
remaining_count = count - slots
slots.times do
@tasks['ondemand_clone_count'] += 1
redis.incr('vmpooler__tasks__ondemandclone')
clone_vm(pool, provider, request_id, pool_alias)
end
redis.pipelined do
@ -1542,6 +1536,7 @@ module Vmpooler
@redis.with_metrics do |redis|
# Clear out the tasks manager, as we don't know about any tasks at this point
redis.set('vmpooler__tasks__clone', 0)
redis.set('vmpooler__tasks__ondemandclone', 0)
# Clear out vmpooler__migrations since stale entries may be left after a restart
redis.del('vmpooler__migration')
end