From c067f850068932745c9c56228bc928ec626f756f Mon Sep 17 00:00:00 2001 From: Glenn Sarti Date: Thu, 2 Feb 2017 17:17:53 -0800 Subject: [PATCH] f pool_manager --- lib/vmpooler/pool_manager.rb | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/vmpooler/pool_manager.rb b/lib/vmpooler/pool_manager.rb index 4d72478..384fac2 100644 --- a/lib/vmpooler/pool_manager.rb +++ b/lib/vmpooler/pool_manager.rb @@ -19,8 +19,8 @@ module Vmpooler $threads = {} # WARNING DEBUG - $logger.log('d',"Flushing REDIS WARNING!!!") - $redis.flushdb + #$logger.log('d',"Flushing REDIS WARNING!!!") + #$redis.flushdb end # Check the state of a VM @@ -60,7 +60,7 @@ module Vmpooler # DONE def fail_pending_vm(vm, pool, timeout, exists=true) clone_stamp = $redis.hget("vmpooler__vm__#{vm}", 'clone') - return if ! clone_stamp + return true if ! clone_stamp time_since_clone = (Time.now - Time.parse(clone_stamp)) / 60 if time_since_clone > timeout @@ -71,8 +71,12 @@ module Vmpooler remove_nonexistent_vm(vm, pool) end end + + true rescue => err $logger.log('d', "Fail pending VM failed with an error: #{err}") + + false end # DONE