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__pending__'+pool['name'], vm['name'])) and
(! $redis.sismember('vmware_host_pool__ready__'+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__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']) $redis.sadd('vmware_host_pool__pending__'+pool['name'], vm['name'])
end end
@ -70,16 +71,24 @@ loop do
(vsphere_helper.find_vms(vm)[vm].summary.guest.toolsRunningStatus == 'guestToolsRunning') and (vsphere_helper.find_vms(vm)[vm].summary.guest.toolsRunningStatus == 'guestToolsRunning') and
(vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress != nil) (vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress != nil)
) )
begin if (vsphere_helper.find_vms(vm)[vm].summary.guest.hostName)
Socket.getaddrinfo(vm, nil) if (vsphere_helper.find_vms(vm)[vm].summary.guest.hostName == vm)
rescue begin
next Socket.getaddrinfo(vm, nil)
end rescue
next
end
$redis.sadd('vmware_host_pool__ready__'+pool['name'], vm) $redis.sadd('vmware_host_pool__ready__'+pool['name'], vm)
$redis.srem('vmware_host_pool__pending__'+pool['name'], vm) $redis.srem('vmware_host_pool__pending__'+pool['name'], vm)
logger.log('s', "[>] '#{vm}' moved to 'ready' queue") 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
end end
@ -148,6 +157,7 @@ loop do
if ( if (
(vsphere_helper.find_vms(vm)[vm]) and (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.toolsRunningStatus == 'guestToolsRunning') and
(vsphere_helper.find_vms(vm)[vm].summary.guest.hostName == vm) and
(vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress != nil) (vsphere_helper.find_vms(vm)[vm].summary.guest.ipAddress != nil)
) )
begin begin
@ -160,23 +170,23 @@ loop do
$redis.srem('vmware_host_pool__failed__'+pool['name'], vm) $redis.srem('vmware_host_pool__failed__'+pool['name'], vm)
logger.log('s', "[>] '#{vm}' moved to 'ready' queue") 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 ( if vsphere_helper.find_vms(vm)[vm].runtime.powerState == 'poweredOn'
(vsphere_helper.find_vms(vm)[vm]) and logger.log('d', "[ ] '#{vm}' is being shut down")
(vsphere_helper.find_vms(vm)[vm].runtime) vsphere_helper.find_vms(vm)[vm].PowerOffVM_Task.wait_for_completion
) end
start = Time.now
if host.runtime.powerState == 'poweredOn' vsphere_helper.find_vms(vm)[vm].Destroy_Task.wait_for_completion
logger.log('d', "[ ] '#{vm}' is being shut down") finish = '%.2f' % (Time.now-start)
host.PowerOffVM_Task.wait_for_completion
logger.log('s', "[-] '#{vm}' destroyed in #{finish} seconds")
end end
host.Destroy_Task.wait_for_completion
finish = '%.2f' % (Time.now-start)
logger.log('s', "[-] '#{vm}' destroyed in #{finish} seconds")
end end
end end