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

Ensure get ondemandvm shows when a request has been deleted

Browse source
This commit is contained in:
kirby@puppetlabs.com 2020-05-11 17:12:46 -07:00
parent 18ca38b8db
commit ea4322799b
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
lib/vmpooler/api/v1.rb
View file

@ -956,6 +956,9 @@ module Vmpooler
result['ready'] = false result['ready'] = false
result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'" result['message'] = "The request failed to provision instances within the configured ondemand_request_ttl '#{config['ondemand_request_ttl']}'"
status 200 status 200
elsif request_hash['status'] == 'deleted'
result['message'] = 'The request has been deleted'
status 200
else else
platform_parts = request_hash['requested'].split(',') platform_parts = request_hash['requested'].split(',')
platform_parts.each do |platform| platform_parts.each do |platform|
@ -980,14 +983,20 @@ module Vmpooler
return result return result
end end
platforms.split(',').each do |platform| if backend.hget("vmpooler__odrequest__#{request_id}", 'status') == 'deleted'
pool_alias, pool, _count = platform.split(':') result['message'] = 'the request has already been deleted'
backend.smembers("vmpooler__#{request_id}__#{pool_alias}__#{pool}")&.each do |vm| else
backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm) backend.hset("vmpooler__odrequest__#{request_id}", 'status', 'deleted')
platforms.split(',').each do |platform|
pool_alias, pool, _count = platform.split(':')
backend.smembers("vmpooler__#{request_id}__#{pool_alias}__#{pool}")&.each do |vm|
backend.smove("vmpooler__running__#{pool}", "vmpooler__completed__#{pool}", vm)
end
backend.del("vmpooler__#{request_id}__#{pool_alias}__#{pool}")
end end
backend.del("vmpooler__#{request_id}__#{pool_alias}__#{pool}") backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0)
end end
backend.expire("vmpooler__odrequest__#{request_id}", 129_600_0)
status 200 status 200
result['ok'] = true result['ok'] = true
result result