mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 10:08:40 -05:00
(DIO-2675) Undo pool size template overrides
This implements a delete method for pooltemplate and poolsize. The API removes the override from Redis and then adds an entry in Redis that causes the pool manager to wake up and process the removal of the override. To facilitate this, a new variable has been created in lib/vmpooler.rb to hold a copy of the original / pre-override config. This supplemental copy of the pools is then indexed for use as a reference. When pool manager wakes up to process an override removal, it looks up the pre-override value from the config via the new variables mentioned above. Just as with entering overrides, no restart is needed. Template and pool size changes are logged so that anyone watching or reviewing the logs can see what happened when. The new API endpoints also return values for both the pre-revert and post-revert value.
This commit is contained in:
parent
6db71d8589
commit
a0caa41a54
7 changed files with 409 additions and 6 deletions
|
|
@ -28,6 +28,10 @@ module Vmpooler
|
|||
Vmpooler::API.settings.config[:pools]
|
||||
end
|
||||
|
||||
def pools_at_startup
|
||||
Vmpooler::API.settings.config[:pools_at_startup]
|
||||
end
|
||||
|
||||
def pool_exists?(template)
|
||||
Vmpooler::API.settings.config[:pool_names].include?(template)
|
||||
end
|
||||
|
|
@ -289,6 +293,32 @@ module Vmpooler
|
|||
puts 'd', "[!] [#{poolname}] failed while evaluating usage labels on '#{vmname}' with an error: #{e}"
|
||||
end
|
||||
|
||||
def reset_pool_size(poolname)
|
||||
result = { 'ok' => false }
|
||||
|
||||
pool_index = pool_index(pools)
|
||||
|
||||
pools_updated = 0
|
||||
sync_pool_sizes
|
||||
|
||||
pool_size_now = pools[pool_index[poolname]]['size'].to_i
|
||||
pool_size_original = pools_at_startup[pool_index[poolname]]['size'].to_i
|
||||
result['pool_size_before_reset'] = pool_size_now
|
||||
result['pool_size_before_overrides'] = pool_size_original
|
||||
|
||||
unless pool_size_now == pool_size_original
|
||||
pools[pool_index[poolname]]['size'] = pool_size_original
|
||||
backend.hdel('vmpooler__config__poolsize', poolname)
|
||||
backend.sadd('vmpooler__pool__undo_size_override', poolname)
|
||||
pools_updated += 1
|
||||
status 201
|
||||
end
|
||||
|
||||
status 200 unless pools_updated > 0
|
||||
result['ok'] = true
|
||||
result
|
||||
end
|
||||
|
||||
def update_pool_size(payload)
|
||||
result = { 'ok' => false }
|
||||
|
||||
|
|
@ -309,6 +339,33 @@ module Vmpooler
|
|||
result
|
||||
end
|
||||
|
||||
def reset_pool_template(poolname)
|
||||
result = { 'ok' => false }
|
||||
|
||||
pool_index_live = pool_index(pools)
|
||||
pool_index_original = pool_index(pools_at_startup)
|
||||
|
||||
pools_updated = 0
|
||||
sync_pool_templates
|
||||
|
||||
template_now = pools[pool_index_live[poolname]]['template']
|
||||
template_original = pools_at_startup[pool_index_original[poolname]]['template']
|
||||
result['template_before_reset'] = template_now
|
||||
result['template_before_overrides'] = template_original
|
||||
|
||||
unless template_now == template_original
|
||||
pools[pool_index_live[poolname]]['template'] = template_original
|
||||
backend.hdel('vmpooler__config__template', poolname)
|
||||
backend.sadd('vmpooler__pool__undo_template_override', poolname)
|
||||
pools_updated += 1
|
||||
status 201
|
||||
end
|
||||
|
||||
status 200 unless pools_updated > 0
|
||||
result['ok'] = true
|
||||
result
|
||||
end
|
||||
|
||||
def update_pool_template(payload)
|
||||
result = { 'ok' => false }
|
||||
|
||||
|
|
@ -1375,6 +1432,26 @@ module Vmpooler
|
|||
JSON.pretty_generate(result)
|
||||
end
|
||||
|
||||
delete "#{api_prefix}/config/poolsize/:pool/?" do
|
||||
content_type :json
|
||||
result = { 'ok' => false }
|
||||
|
||||
if config['experimental_features']
|
||||
need_token! if Vmpooler::API.settings.config[:auth]
|
||||
|
||||
if pool_exists?(params[:pool])
|
||||
result = reset_pool_size(params[:pool])
|
||||
else
|
||||
metrics.increment('config.invalid.unknown')
|
||||
status 404
|
||||
end
|
||||
else
|
||||
status 405
|
||||
end
|
||||
|
||||
JSON.pretty_generate(result)
|
||||
end
|
||||
|
||||
post "#{api_prefix}/config/poolsize/?" do
|
||||
content_type :json
|
||||
result = { 'ok' => false }
|
||||
|
|
@ -1406,6 +1483,26 @@ module Vmpooler
|
|||
JSON.pretty_generate(result)
|
||||
end
|
||||
|
||||
delete "#{api_prefix}/config/pooltemplate/:pool/?" do
|
||||
content_type :json
|
||||
result = { 'ok' => false }
|
||||
|
||||
if config['experimental_features']
|
||||
need_token! if Vmpooler::API.settings.config[:auth]
|
||||
|
||||
if pool_exists?(params[:pool])
|
||||
result = reset_pool_template(params[:pool])
|
||||
else
|
||||
metrics.increment('config.invalid.unknown')
|
||||
status 404
|
||||
end
|
||||
else
|
||||
status 405
|
||||
end
|
||||
|
||||
JSON.pretty_generate(result)
|
||||
end
|
||||
|
||||
post "#{api_prefix}/config/pooltemplate/?" do
|
||||
content_type :json
|
||||
result = { 'ok' => false }
|
||||
|
|
|
|||
|
|
@ -784,6 +784,10 @@ module Vmpooler
|
|||
# - Fires when a pool reset is requested
|
||||
# - Additional options
|
||||
# :poolname
|
||||
# :undo_override
|
||||
# - Fires when a pool override removal is requested
|
||||
# - Additional options
|
||||
# :poolname
|
||||
#
|
||||
def sleep_with_wakeup_events(loop_delay, wakeup_period = 5, options = {})
|
||||
exit_by = Time.now + loop_delay
|
||||
|
|
@ -826,6 +830,11 @@ module Vmpooler
|
|||
break if pending
|
||||
end
|
||||
|
||||
if options[:undo_override]
|
||||
break if redis.sismember('vmpooler__pool__undo_template_override', options[:poolname])
|
||||
break if redis.sismember('vmpooler__pool__undo_size_override', options[:poolname])
|
||||
end
|
||||
|
||||
if options[:pending_vm]
|
||||
pending_vm_count = redis.scard("vmpooler__pending__#{options[:poolname]}")
|
||||
break unless pending_vm_count == 0
|
||||
|
|
@ -880,7 +889,7 @@ module Vmpooler
|
|||
loop_delay = (loop_delay * loop_delay_decay).to_i
|
||||
loop_delay = loop_delay_max if loop_delay > loop_delay_max
|
||||
end
|
||||
sleep_with_wakeup_events(loop_delay, loop_delay_min, pool_size_change: true, poolname: pool['name'], pool_template_change: true, clone_target_change: true, pending_vm: true, pool_reset: true)
|
||||
sleep_with_wakeup_events(loop_delay, loop_delay_min, pool_size_change: true, poolname: pool['name'], pool_template_change: true, clone_target_change: true, pending_vm: true, pool_reset: true, undo_override: true)
|
||||
|
||||
unless maxloop == 0
|
||||
break if loop_count >= maxloop
|
||||
|
|
@ -1040,15 +1049,18 @@ module Vmpooler
|
|||
return if mutex.locked?
|
||||
|
||||
@redis.with_metrics do |redis|
|
||||
poolsize = redis.hget('vmpooler__config__poolsize', pool['name'])
|
||||
break if poolsize.nil?
|
||||
pool_size_requested = redis.hget('vmpooler__config__poolsize', pool['name'])
|
||||
break if pool_size_requested.nil?
|
||||
|
||||
poolsize = Integer(poolsize)
|
||||
break if poolsize == pool['size']
|
||||
pool_size_requested = Integer(pool_size_requested)
|
||||
pool_size_currently = pool['size']
|
||||
break if pool_size_requested == pool_size_currently
|
||||
|
||||
mutex.synchronize do
|
||||
pool['size'] = poolsize
|
||||
pool['size'] = pool_size_requested
|
||||
end
|
||||
|
||||
$logger.log('s', "[*] [#{pool['name']}] size updated from #{pool_size_currently} to #{pool_size_requested}")
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -1066,6 +1078,38 @@ module Vmpooler
|
|||
end
|
||||
end
|
||||
|
||||
def undo_override(pool, provider)
|
||||
poolname = pool['name']
|
||||
mutex = pool_mutex(poolname)
|
||||
return if mutex.locked?
|
||||
|
||||
@redis.with_metrics do |redis|
|
||||
break unless redis.sismember('vmpooler__pool__undo_template_override', poolname)
|
||||
|
||||
redis.srem('vmpooler__pool__undo_template_override', poolname)
|
||||
template_now = pool['template']
|
||||
template_original = $config[:pools_at_startup][$config[:pool_index][poolname]]['template']
|
||||
|
||||
mutex.synchronize do
|
||||
update_pool_template(pool, provider, template_original, template_now, redis)
|
||||
end
|
||||
end
|
||||
|
||||
@redis.with_metrics do |redis|
|
||||
break unless redis.sismember('vmpooler__pool__undo_size_override', poolname)
|
||||
|
||||
redis.srem('vmpooler__pool__undo_size_override', poolname)
|
||||
pool_size_now = pool['size']
|
||||
pool_size_original = $config[:pools_at_startup][$config[:pool_index][poolname]]['size']
|
||||
|
||||
mutex.synchronize do
|
||||
pool['size'] = pool_size_original
|
||||
end
|
||||
|
||||
$logger.log('s', "[*] [#{poolname}] size updated from #{pool_size_now} to #{pool_size_original}")
|
||||
end
|
||||
end
|
||||
|
||||
def create_inventory(pool, provider, pool_check_response)
|
||||
inventory = {}
|
||||
begin
|
||||
|
|
@ -1300,6 +1344,9 @@ module Vmpooler
|
|||
# Reset a pool when poolreset is requested from the API
|
||||
reset_pool(pool)
|
||||
|
||||
# Undo overrides submitted via the api
|
||||
undo_override(pool, provider)
|
||||
|
||||
pool_check_response
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue