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

Merge pull request #266 from mattkirby/pooler_31

Browse source 
(POOLER-31) Expire redis vm key when clone fails
This commit is contained in:
mchllweeks 2018-06-29 16:43:04 -07:00 • committed by GitHub
commit 0ce66eb763
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/vmpooler/pool_manager.rb
View file

@ -245,7 +245,9 @@ module Vmpooler
$metrics.timing("clone.#{pool_name}", finish)
rescue => _err
$redis.srem('vmpooler__pending__' + pool_name, new_vmname)
$redis.srem("vmpooler__pending__#{pool_name}", new_vmname)
expiration_ttl = $config[:redis]['data_ttl'].to_i * 60 * 60
$redis.expire("vmpooler__vm__#{new_vmname}", expiration_ttl)
raise _err
ensure
$redis.decr('vmpooler__tasks__clone')

8
spec/unit/pool_manager_spec.rb
View file

@ -583,6 +583,7 @@ EOT
describe '#_clone_vm' do
let (:pool_object) { { 'name' => pool } }
let (:redis_ttl) { 1 }
before do
expect(subject).not_to be_nil
@ -593,6 +594,8 @@ EOT
---
:config:
prefix: "prefix"
:redis:
ttl: #{redis_ttl}
EOT
)
}
@ -664,6 +667,11 @@ EOT
expect(redis.get('vmpooler__tasks__clone')).to eq('1')
end
it 'should expire the vm metadata' do
expect(redis).to receive(:expire)
expect{subject._clone_vm(pool_object,provider)}.to raise_error(/MockError/)
end
it 'should raise the error' do
expect{subject._clone_vm(pool_object,provider)}.to raise_error(/MockError/)
end