mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 10:08:40 -05:00
(POOLER-70) Update check_disk_queue for VM Provider
Previously the Pool Manager would use vSphere objects directly. This commit - Modifies the pool_manager to use the VM provider methods instead
This commit is contained in:
parent
e01b96c6d0
commit
41f9d7b3c4
2 changed files with 69 additions and 29 deletions
|
|
@ -367,11 +367,10 @@ module Vmpooler
|
|||
def check_disk_queue(maxloop = 0, loop_delay = 5)
|
||||
$logger.log('d', "[*] [disk_manager] starting worker thread")
|
||||
|
||||
$providers['disk_manager'] ||= Vmpooler::VsphereHelper.new $config, $metrics
|
||||
$threads['disk_manager'] = Thread.new do
|
||||
loop_count = 1
|
||||
loop do
|
||||
_check_disk_queue $providers['disk_manager']
|
||||
_check_disk_queue
|
||||
sleep(loop_delay)
|
||||
|
||||
unless maxloop.zero?
|
||||
|
|
@ -382,15 +381,20 @@ module Vmpooler
|
|||
end
|
||||
end
|
||||
|
||||
def _check_disk_queue(provider)
|
||||
vm = $redis.spop('vmpooler__tasks__disk')
|
||||
|
||||
unless vm.nil?
|
||||
def _check_disk_queue
|
||||
task_detail = $redis.spop('vmpooler__tasks__disk')
|
||||
unless task_detail.nil?
|
||||
begin
|
||||
vm_name, disk_size = vm.split(':')
|
||||
create_vm_disk(vm_name, disk_size, provider)
|
||||
rescue
|
||||
$logger.log('s', "[!] [disk_manager] disk creation appears to have failed")
|
||||
vm_name, disk_size = task_detail.split(':')
|
||||
pool_name = get_pool_name_for_vm(vm_name)
|
||||
raise("Unable to determine which pool #{vm_name} is a member of") if pool_name.nil?
|
||||
|
||||
provider = get_provider_for_pool(pool_name)
|
||||
raise("Missing Provider for vm #{vm_name} in pool #{pool_name}") if provider.nil?
|
||||
|
||||
create_vm_disk(pool_name, vm_name, disk_size, provider)
|
||||
rescue => err
|
||||
$logger.log('s', "[!] [disk_manager] disk creation appears to have failed: #{err}")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue