Futzing with pooler queue logic

This commit is contained in:
Scott Schneider 2013-10-10 14:32:03 -07:00
parent 3ca6cdf418
commit 26aa06e6fa

View file

@ -50,7 +50,8 @@ loop do
(! $redis.sismember('vmware_host_pool__pending__'+pool['name'], vm['name'])) and
(! $redis.sismember('vmware_host_pool__ready__'+pool['name'], vm['name'])) and
(! $redis.sismember('vmware_host_pool__running__'+pool['name'], vm['name'])) and
(! $redis.sismember('vmware_host_pool__completed__'+pool['name'], vm['name']))
(! $redis.sismember('vmware_host_pool__completed__'+pool['name'], vm['name'])) and
(! $redis.sismember('vmware_host_pool__failed__'+pool['name'], vm['name']))
)
$redis.sadd('vmware_host_pool__pending__'+pool['name'], vm['name'])
end
@ -70,6 +71,8 @@ loop do
(vsphere_helper.find_vms(vm)[vm].summary.guest.toolsRunningStatus == 'guestToolsRunning') and
(vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress != nil)
)
if (vsphere_helper.find_vms(vm)[vm].summary.guest.hostName)
if (vsphere_helper.find_vms(vm)[vm].summary.guest.hostName == vm)
begin
Socket.getaddrinfo(vm, nil)
rescue
@ -80,6 +83,12 @@ loop do
$redis.srem('vmware_host_pool__pending__'+pool['name'], vm)
logger.log('s', "[>] '#{vm}' moved to 'ready' queue")
else
$redis.srem('vmware_host_pool__pending__'+pool['name'], vm)
$redis.sadd('vmware_host_pool__failed__'+pool['name'], vm)
logger.log('s', "[<] '#{vm}' moved to 'failed' queue")
end
end
end
@ -148,6 +157,7 @@ loop do
if (
(vsphere_helper.find_vms(vm)[vm]) and
(vsphere_helper.find_vms(vm)[vm].summary.guest.toolsRunningStatus == 'guestToolsRunning') and
(vsphere_helper.find_vms(vm)[vm].summary.guest.hostName == vm) and
(vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress != nil)
)
begin
@ -160,25 +170,25 @@ loop do
$redis.srem('vmware_host_pool__failed__'+pool['name'], vm)
logger.log('s', "[>] '#{vm}' moved to 'ready' queue")
end
else
if (
(vsphere_helper.find_vms(vm)[vm]) and
(vsphere_helper.find_vms(vm)[vm].runtime)
)
start = Time.now
if host.runtime.powerState == 'poweredOn'
if vsphere_helper.find_vms(vm)[vm].runtime.powerState == 'poweredOn'
logger.log('d', "[ ] '#{vm}' is being shut down")
host.PowerOffVM_Task.wait_for_completion
vsphere_helper.find_vms(vm)[vm].PowerOffVM_Task.wait_for_completion
end
host.Destroy_Task.wait_for_completion
vsphere_helper.find_vms(vm)[vm].Destroy_Task.wait_for_completion
finish = '%.2f' % (Time.now-start)
logger.log('s', "[-] '#{vm}' destroyed in #{finish} seconds")
end
end
end
# Bring the pool up to the desired size
if total < pool['size']