From 3c42155c183f0b4c62d768e64c449f231b4361ec Mon Sep 17 00:00:00 2001 From: Scott Schneider Date: Fri, 13 Dec 2013 11:19:37 -0800 Subject: [PATCH] Fixup for long-running destruction --- vmware-host-pooler | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/vmware-host-pooler b/vmware-host-pooler index 0061682..a7c5fe3 100755 --- a/vmware-host-pooler +++ b/vmware-host-pooler @@ -308,15 +308,12 @@ def check_pool pool end # LONG-RUNNING - $redis.hkeys('vmware_host_pool__active__'+pool['name']).each do |vm| + $redis.smembers('vmware_host_pool__running__'+pool['name']).each do |vm| running = (Time.now - Time.parse($redis.hget('vmware_host_pool__active__'+pool['name'], vm)))/60/60 if (running > 12) - $logger.log('d', "[!] [#{pool}] '#{vm}' reached end of TTL after 12 hours") + $redis.smove('vmware_host_pool__running__'+pool['name'], 'vmware_host_pool__completed__'+pool['name'], vm) - begin - destroy_vm(vm, pool['name']) - rescue - end + $logger.log('d', "[!] [#{pool['name']}] '#{vm}' reached end of TTL after 12 hours") end end