Merge pull request #271 from mattkirby/less_delta_disks

Ensure template deltas are created once

lib/vmpooler/pool_manager.rb

@@ -630,6 +630,13 @@ module Vmpooler
           prepare_template(pool, provider)
           prepared_template = $redis.hget('vmpooler__template__prepared', pool['name'])
         end
+      elsif prepared_template != pool['template']
+        if configured_template.nil?
+          mutex.synchronize do
+            prepare_template(pool, provider)
+            prepared_template = $redis.hget('vmpooler__template__prepared', pool['name'])
+          end
+        end
       end
       return if configured_template.nil?
       return if configured_template == prepared_template
@@ -901,8 +908,6 @@ module Vmpooler
       $redis.set('vmpooler__tasks__clone', 0)
       # Clear out vmpooler__migrations since stale entries may be left after a restart
       $redis.del('vmpooler__migration')
-      # Ensure template deltas are created on each startup
-      $redis.del('vmpooler__template__prepared')
 
       # Copy vSphere settings to correct location.  This happens with older configuration files
       if !$config[:vsphere].nil? && ($config[:providers].nil? || $config[:providers][:vsphere].nil?)

spec/unit/pool_manager_spec.rb

@@ -1838,8 +1838,26 @@ EOT
     end
 
     context 'when prepared template is nil' do
-      before(:each) do
+
+      it 'should prepare the template' do
         expect(redis).to receive(:hget).with('vmpooler__template__prepared', pool).and_return(nil)
+        expect(subject).to receive(:prepare_template).with(config[:pools][0], provider)
+
+        subject.evaluate_template(config[:pools][0], provider)
+      end
+
+      it 'should not prepare the template again' do
+        expect(redis).to receive(:hget).with('vmpooler__template__prepared', pool).and_return(current_template)
+        expect(subject).to_not receive(:prepare_template).with(config[:pools][0], provider)
+
+        subject.evaluate_template(config[:pools][0], provider)
+      end
+    end
+
+    context 'when the configured pool template does not match the prepared template' do
+      before(:each) do
+        config[:pools][0]['template'] = new_template
+        expect(redis).to receive(:hget).with('vmpooler__template__prepared', pool).and_return(current_template)
       end
 
       it 'should prepare the template' do
@@ -1847,6 +1865,15 @@ EOT
 
         subject.evaluate_template(config[:pools][0], provider)
       end
+
+      context 'if configured_template is provided' do
+        it 'should not run prepare_template' do
+          expect(redis).to receive(:hget).with('vmpooler__config__template', pool).and_return(current_template)
+          expect(subject).to_not receive(:prepare_template)
+
+          subject.evaluate_template(config[:pools][0], provider)
+        end
+      end
     end
 
     context 'when a new template is requested' do
@@ -2299,7 +2326,6 @@ EOT
       it 'should run startup tasks only once' do
         expect(redis).to receive(:set).with('vmpooler__tasks__clone', 0).once
         expect(redis).to receive(:del).with('vmpooler__migration').once
-        expect(redis).to receive(:del).with('vmpooler__template__prepared').once
 
         subject.execute!(maxloop,0)
       end