bugfix the backup image file is deleted.

axsh · Oct 24, 2012 · ddb9e7e · ddb9e7e
1 parent 4621a0b
commit ddb9e7e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/dcmgr/lib/dcmgr/drivers/linux_local_store.rb b/dcmgr/lib/dcmgr/drivers/linux_local_store.rb
@@ -79,7 +79,7 @@ def deploy_image(inst,ctx)
         raise "Image file is not ready: #{ctx.os_devpath}" unless File.exist?(ctx.os_devpath)
 
       ensure
-        unless Dcmgr.conf.local_store.enable_image_caching && @ctx.inst[:image][:is_cacheable]
+        unless Dcmgr.conf.local_store.enable_image_caching && @ctx.inst[:image][:is_cacheable] || @bkst_drv_class.include?(BackupStorage::CommandAPI)
           File.unlink(vmimg_cache_path()) rescue nil
         end
       end
@@ -179,11 +179,10 @@ def vmimg_cache_path(basename=nil)
         basename ||= begin
                        @ctx.inst[:image][:backup_object][:uuid] + (@suffix ? @suffix : "")
                      end
-        if @bkst_drv_class.include?(BackupStorage::CommandAPI)
-          URI.parse(@ctx.inst[:image][:backup_object][:uri]).path
-        else
+        if (Dcmgr.conf.local_store.enable_image_caching && @ctx.inst[:image][:is_cacheable]) || !@bkst_drv_class.include?(BackupStorage::CommandAPI)
           File.expand_path(basename, (Dcmgr.conf.local_store.enable_image_caching && @ctx.inst[:image][:is_cacheable] ? vmimg_cache_dir : download_tmp_dir))
-          dir = Dcmgr.conf.local_store.enable_image_caching && @ctx.inst[:image][:is_cacheable] ? vmimg_cache_dir : download_tmp_dir
+        else
+          URI.parse(@ctx.inst[:image][:backup_object][:uri]).path
         end
       end