From 3df5ec7981b28f3a68a4e1f7fbf729c3b0630661 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Thu, 4 Nov 2010 11:39:20 -0700
Subject: [PATCH] bug 6987: root disk snapshot depends on template, if template
 is deleted, then you can not use the snapshot. this issue doesn't exist in
 2.2. in this fix, template is not deleted from sencondary storage

test:

1. create a template
2. create a vm from this template
3. create several snapshots againg vm root dist
4. delete template
5, create vm from one of the snapshots
see if the issue is fixed

status 6987: resolved fixed
---
 server/src/com/cloud/storage/StorageManagerImpl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index a90cd6ea544..0180e9eab7e 100644
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -1775,7 +1775,7 @@ public class StorageManagerImpl implements StorageManager {
         }
 
         // Cleanup secondary storage hosts
-        List<HostVO> secondaryStorageHosts = _hostDao.listSecondaryStorageHosts();
+/*        List<HostVO> secondaryStorageHosts = _hostDao.listSecondaryStorageHosts();
         for (HostVO secondaryStorageHost : secondaryStorageHosts) {
             try {
                 long hostId = secondaryStorageHost.getId();
@@ -1807,6 +1807,7 @@ public class StorageManagerImpl implements StorageManager {
                 s_logger.warn("problem cleaning up secondary storage " + secondaryStorageHost, e);
             }
         }
+*/
         
         List<VolumeVO> vols = _volsDao.listRemovedButNotDestroyed();
         for (VolumeVO vol : vols) {