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

158
lib/vmpooler/pool_manager.rb
View file

@ -187,101 +187,99 @@ 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 =~ /\//
templatefolders = template.split('/') templatefolders = template.split('/')
vm['template'] = templatefolders.pop vm['template'] = templatefolders.pop
end end
if templatefolders if templatefolders
vm[vm['template']] = vsphere.find_folder(templatefolders.join('/')).find(vm['template']) vm[vm['template']] = vsphere.find_folder(templatefolders.join('/')).find(vm['template'])
else else
fail 'Please provide a full path to the template' fail 'Please provide a full path to the template'
end end
if vm['template'].length == 0 if vm['template'].length == 0
fail "Unable to find template '#{vm['template']}'!" fail "Unable to find template '#{vm['template']}'!"
end end
# Generate a randomized hostname # Generate a randomized hostname
o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten o = [('a'..'z'), ('0'..'9')].map(&:to_a).flatten
vm['hostname'] = $config[:config]['prefix'] + o[rand(25)] + (0...14).map { o[rand(o.length)] }.join vm['hostname'] = $config[:config]['prefix'] + o[rand(25)] + (0...14).map { o[rand(o.length)] }.join
# Add VM to Redis inventory ('pending' pool) # Add VM to Redis inventory ('pending' pool)
$redis.sadd('vmpooler__pending__' + vm['template'], vm['hostname']) $redis.sadd('vmpooler__pending__' + vm['template'], vm['hostname'])
$redis.hset('vmpooler__vm__' + vm['hostname'], 'clone', Time.now) $redis.hset('vmpooler__vm__' + vm['hostname'], 'clone', Time.now)
$redis.hset('vmpooler__vm__' + vm['hostname'], 'template', vm['template']) $redis.hset('vmpooler__vm__' + vm['hostname'], 'template', vm['template'])
# Annotate with creation time, origin template, etc. # Annotate with creation time, origin template, etc.
# Add extraconfig options that can be queried by vmtools # Add extraconfig options that can be queried by vmtools
configSpec = RbVmomi::VIM.VirtualMachineConfigSpec( configSpec = RbVmomi::VIM.VirtualMachineConfigSpec(
annotation: JSON.pretty_generate( annotation: JSON.pretty_generate(
name: vm['hostname'],
created_by: $config[:vsphere]['username'],
base_template: vm['template'],
creation_timestamp: Time.now.utc
),
extraConfig: [
{ key: 'guestinfo.hostname',
value: vm['hostname']
}
]
)
# Choose a clone target
if target
$clone_target = vsphere.find_least_used_host(target)
elsif $config[:config]['clone_target']
$clone_target = vsphere.find_least_used_host($config[:config]['clone_target'])
end
# Put the VM in the specified folder and resource pool
relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(
datastore: vsphere.find_datastore(datastore),
host: $clone_target,
diskMoveType: :moveChildMostDiskBacking
)
# Create a clone spec
spec = RbVmomi::VIM.VirtualMachineCloneSpec(
location: relocateSpec,
config: configSpec,
powerOn: true,
template: false
)
# Clone the VM
$logger.log('d', "[ ] [#{vm['template']}] '#{vm['hostname']}' is being cloned from '#{vm['template']}'")
begin
start = Time.now
vm[vm['template']].CloneVM_Task(
folder: vsphere.find_folder(folder),
name: vm['hostname'], name: vm['hostname'],
spec: spec created_by: $config[:vsphere]['username'],
).wait_for_completion base_template: vm['template'],
finish = '%.2f' % (Time.now - start) creation_timestamp: Time.now.utc
),
extraConfig: [
{ key: 'guestinfo.hostname',
value: vm['hostname']
}
]
)
$redis.hset('vmpooler__clone__' + Date.today.to_s, vm['template'] + ':' + vm['hostname'], finish) # Choose a clone target
$redis.hset('vmpooler__vm__' + vm['hostname'], 'clone_time', finish) if target
$clone_target = vsphere.find_least_used_host(target)
elsif $config[:config]['clone_target']
$clone_target = vsphere.find_least_used_host($config[:config]['clone_target'])
end
$logger.log('s', "[+] [#{vm['template']}] '#{vm['hostname']}' cloned from '#{vm['template']}' in #{finish} seconds") # Put the VM in the specified folder and resource pool
rescue => err relocateSpec = RbVmomi::VIM.VirtualMachineRelocateSpec(
$logger.log('s', "[!] [#{vm['template']}] '#{vm['hostname']}' clone failed with an error: #{err}") datastore: vsphere.find_datastore(datastore),
$redis.srem('vmpooler__pending__' + vm['template'], vm['hostname']) host: $clone_target,
raise diskMoveType: :moveChildMostDiskBacking
end )
$redis.decr('vmpooler__tasks__clone') # Create a clone spec
spec = RbVmomi::VIM.VirtualMachineCloneSpec(
location: relocateSpec,
config: configSpec,
powerOn: true,
template: false
)
$metrics.timing("clone.#{vm['template']}", finish) # Clone the VM
$logger.log('d', "[ ] [#{vm['template']}] '#{vm['hostname']}' is being cloned from '#{vm['template']}'")
begin
start = Time.now
vm[vm['template']].CloneVM_Task(
folder: vsphere.find_folder(folder),
name: vm['hostname'],
spec: spec
).wait_for_completion
finish = '%.2f' % (Time.now - start)
$redis.hset('vmpooler__clone__' + Date.today.to_s, vm['template'] + ':' + vm['hostname'], finish)
$redis.hset('vmpooler__vm__' + vm['hostname'], 'clone_time', finish)
$logger.log('s', "[+] [#{vm['template']}] '#{vm['hostname']}' cloned from '#{vm['template']}' in #{finish} seconds")
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']}' clone failed with an error: #{err}")
$redis.srem('vmpooler__pending__' + vm['template'], vm['hostname'])
raise raise
end end
$redis.decr('vmpooler__tasks__clone')
$metrics.timing("clone.#{vm['template']}", finish)
end end
rescue => err
$logger.log('s', "[!] [#{vm['template']}] '#{vm['hostname']}' failed while preparing to clone with an error: #{err}")
raise
end end
# Destroy a VM # Destroy a VM