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

(maint) Add the last boot time for each pool

Browse source 
This commit add a redis hash where there is one key per pool, and the
stored value is the last time a VM was booted e.g. the last time
a VM went from 'pending' to 'ready'. This is also displayed in the
API as lastBoot:'2018-03-23 17:43:39 +0000'. The data can then be
used by any external system, in this case our alarming system.
This commit is contained in:
Samuel Beaulieu 2018-03-23 12:48:33 -05:00 • committed by mattkirby
parent d57fc72fdb
commit 10245321bf
3 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,17 +205,19 @@ module Vmpooler
result[:pools] = {} unless views and not views.include?("pools") result[:pools] = {} unless views and not views.include?("pools")
pools.each do |pool| pools.each do |pool|
# REMIND: move this out of the API and into the back-end # REMIND: move this out of the API and into the back-end
ready = backend.scard('vmpooler__ready__' + pool['name']).to_i ready = backend.scard('vmpooler__ready__' + pool['name']).to_i
running = backend.scard('vmpooler__running__' + pool['name']).to_i running = backend.scard('vmpooler__running__' + pool['name']).to_i
pending = backend.scard('vmpooler__pending__' + pool['name']).to_i pending = backend.scard('vmpooler__pending__' + pool['name']).to_i
max = pool['size'] max = pool['size']
aka = pool['alias'] lastBoot = backend.hget('vmpooler__lastboot',pool['name']).to_s
aka = pool['alias']
result[:pools][pool['name']] = { result[:pools][pool['name']] = {
ready: ready, ready: ready,
running: running, running: running,
pending: pending, pending: pending,
max: max max: max,
lastBoot: lastBoot
} }
if aka if aka

7
lib/vmpooler/pool_manager.rb
View file

@ -33,7 +33,7 @@ module Vmpooler
begin begin
_check_pending_vm(vm, pool, timeout, provider) _check_pending_vm(vm, pool, timeout, provider)
rescue => err rescue => err
$logger.log('s', "[!] [#{pool}] '#{vm}' errored while checking a pending vm : #{err}") $logger.log('s', "[!] [#{pool}] '#{vm}' #{timeout} #{provider} errored while checking a pending vm : #{err}")
fail_pending_vm(vm, pool, timeout) fail_pending_vm(vm, pool, timeout)
raise raise
end end
@ -89,7 +89,10 @@ module Vmpooler
finish = format('%.2f', Time.now - Time.parse(clone_time)) if clone_time finish = format('%.2f', Time.now - Time.parse(clone_time)) if clone_time
$redis.smove('vmpooler__pending__' + pool, 'vmpooler__ready__' + pool, vm) $redis.smove('vmpooler__pending__' + pool, 'vmpooler__ready__' + pool, vm)
$redis.hset('vmpooler__boot__' + Date.today.to_s, pool + ':' + vm, finish) $redis.hset('vmpooler__boot__' + Date.today.to_s, pool + ':' + vm, finish) # maybe remove as this is never used by vmpooler itself?
# last boot time is displayed in API, and used by alarming script
$redis.hset('vmpooler__lastboot', pool, Time.now)
$logger.log('s', "[>] [#{pool}] '#{vm}' moved from 'pending' to 'ready' queue") $logger.log('s', "[>] [#{pool}] '#{vm}' moved from 'pending' to 'ready' queue")
end end

6
spec/unit/pool_manager_spec.rb
View file

@ -222,6 +222,12 @@ EOT
redis.hset("vmpooler__vm__#{vm}", 'clone','iamnotparsable_asdate') redis.hset("vmpooler__vm__#{vm}", 'clone','iamnotparsable_asdate')
expect{subject.move_pending_vm_to_ready(vm, pool, host)}.to raise_error(/iamnotparsable_asdate/) expect{subject.move_pending_vm_to_ready(vm, pool, host)}.to raise_error(/iamnotparsable_asdate/)
end end
it 'should save the last boot time' do
expect(redis.hget('vmpooler__lastboot', pool)).to be(nil)
subject.move_pending_vm_to_ready(vm, pool, host)
expect(redis.hget('vmpooler__lastboot', pool)).to_not be(nil)
end
end end
end end