Merge pull request #266 from mattkirby/pooler_31

(POOLER-31) Expire redis vm key when clone fails

lib/vmpooler/pool_manager.rb

@@ -245,7 +245,9 @@ def _clone_vm(pool, provider)
 
         $metrics.timing("clone.#{pool_name}", finish)
       rescue => _err
-        $redis.srem('vmpooler__pending__' + pool_name, new_vmname)
+        $redis.srem("vmpooler__pending__#{pool_name}", new_vmname)
+        expiration_ttl = $config[:redis]['data_ttl'].to_i * 60 * 60
+        $redis.expire("vmpooler__vm__#{new_vmname}", expiration_ttl)
         raise _err
       ensure
         $redis.decr('vmpooler__tasks__clone')

spec/unit/pool_manager_spec.rb

@@ -583,6 +583,7 @@
 
   describe '#_clone_vm' do
     let (:pool_object) { { 'name' => pool } }
+    let (:redis_ttl) { 1 }
 
     before do
       expect(subject).not_to be_nil
@@ -593,6 +594,8 @@
 ---
 :config:
   prefix: "prefix"
+:redis:
+  ttl: #{redis_ttl}
 EOT
       )
     }
@@ -664,6 +667,11 @@
         expect(redis.get('vmpooler__tasks__clone')).to eq('1')
       end
 
+      it 'should expire the vm metadata' do
+        expect(redis).to receive(:expire)
+        expect{subject._clone_vm(pool_object,provider)}.to raise_error(/MockError/)
+      end
+
       it 'should raise the error' do
         expect{subject._clone_vm(pool_object,provider)}.to raise_error(/MockError/)
       end