From 06bdc27ca87e229d7db9f8310493bc184f28d107 Mon Sep 17 00:00:00 2001 From: Gavin Williams Date: Tue, 31 Mar 2015 17:18:03 +0100 Subject: [PATCH] Clean up VM's that have been removed from VMware inventory outside of vmpooler. Fixes #80 --- lib/vmpooler/pool_manager.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index b6f7ee8..9fd34b9 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -337,6 +337,10 @@ module Vmpooler check_ready_vm(vm, pool['name'], pool['ready_ttl'] || 0) rescue end + else + $logger.log('d', "[*] [#{pool['name']}] vm #{vm} is not in inventory, removing from 'ready' queue") + $redis.srem('vmpooler__ready__' + pool['name'], vm) + $redis.del('vmpooler__vm__' + vm) end end @@ -355,6 +359,10 @@ module Vmpooler check_pending_vm(vm, pool['name'], pool['timeout']) rescue end + else + $logger.log('d', "[*] [#{pool['name']}] #{vm} not in inventory, removing from 'pending' queue") + $redis.srem('vmpooler__pending__' + pool['name'], vm) + $redis.del('vmpooler__vm__' + vm) end end