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

(POOLER-47) Update rescue location for clone_vm

Browse source 
This commit shifts the rescue block for clone_vm to ensure it is reached when a failure occurs. Without this change the rescue block may be skipped and cause vmpooler__tasks__clone to not decr, which in turn causes clone operations to stop.
This commit is contained in:
kirby@puppetlabs.com 2016-12-02 05:03:52 -08:00
parent 1bbd623609
commit 133bf7eb12
1 changed files with 78 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/vmpooler/pool_manager.rb
View file

@ -187,7 +187,6 @@ module Vmpooler
# Clone a VM # Clone a VM
def clone_vm(template, folder, datastore, target, vsphere) def clone_vm(template, folder, datastore, target, vsphere)
Thread.new do Thread.new do
begin
vm = {} vm = {}
if template =~ /\// if template =~ /\//
@ -277,12 +276,11 @@ module Vmpooler
$redis.decr('vmpooler__tasks__clone') $redis.decr('vmpooler__tasks__clone')
$metrics.timing("clone.#{vm['template']}", finish) $metrics.timing("clone.#{vm['template']}", finish)
end
rescue => err rescue => err
$logger.log('s', "[!] [#{vm['template']}] '#{vm['hostname']}' failed while preparing to clone with an error: #{err}") $logger.log('s', "[!] [#{vm['template']}] '#{vm['hostname']}' failed while preparing to clone with an error: #{err}")
raise raise
end end
end
end
# Destroy a VM # Destroy a VM
def destroy_vm(vm, pool, vsphere) def destroy_vm(vm, pool, vsphere)