Merge pull request #293 from mattkirby/do_not_discover_destroying

Remove VM from completed only after destroy

CHANGELOG.md

@@ -16,6 +16,7 @@ git logs & PR history.
 ### Fixed
 
 - (POOLER-128) VM specific mutex objects are not dereferenced when a VM is destroyed
+- A VM that is being destroyed is reported as discovered
 
 # [0.1.0](/~https://github.com/puppetlabs/vmpooler/compare/4c858d012a262093383e57ea6db790521886d8d4...master)
 

lib/vmpooler/pool_manager.rb

@@ -298,7 +298,6 @@ def _destroy_vm(vm, pool, provider)
       mutex = vm_mutex(vm)
       return if mutex.locked?
       mutex.synchronize do
-        $redis.srem('vmpooler__completed__' + pool, vm)
         $redis.hdel('vmpooler__active__' + pool, vm)
         $redis.hset('vmpooler__vm__' + vm, 'destroy', Time.now)
 
@@ -309,6 +308,8 @@ def _destroy_vm(vm, pool, provider)
 
         provider.destroy_vm(pool, vm)
 
+        $redis.srem('vmpooler__completed__' + pool, vm)
+
         finish = format('%.2f', Time.now - start)
         $logger.log('s', "[-] [#{pool}] '#{vm}' destroyed in #{finish} seconds")
         $metrics.timing("destroy.#{pool}", finish)