bug 7041: fix npe in delete template from storage pool, if the template already marked as removed

edisonSu · edisonSu · commit 433c28fb1611 · 2010-11-05T16:02:18.000-07:00
status 7041: resolved fixed
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
@@ -80,8 +80,8 @@ public static enum FileSystem {
     }
     
     public static enum TemplateType {
-    	SYSTEM,
-    	BUILTIN
+    	SYSTEM, /*routing, system vm template*/
+    	BUILTIN /*buildin template*/
     }
     
     public static enum StoragePoolType {
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -231,6 +231,7 @@
 import com.cloud.storage.SnapshotVO;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Storage.ImageFormat;
+import com.cloud.storage.Storage.TemplateType;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePoolHostVO;
 import com.cloud.storage.StoragePoolVO;
@@ -3723,7 +3724,7 @@ public List<VolumeVO> searchForVolumes(ListVolumesCmd cmd) throws InvalidParamet
         for(VolumeVO v:allVolumes)
         {
         	VMTemplateVO template = _templateDao.findById(v.getTemplateId());
-        	if(template!=null && template.getUniqueName().startsWith("routing"))
+        	if(template!=null && (template.getTemplateType() == TemplateType.SYSTEM))
         	{
         		//do nothing
         	}
diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java
@@ -953,10 +953,10 @@ public List<VMTemplateStoragePoolVO> getUnusedTemplatesInPool(StoragePoolVO pool
 		List<VMTemplateStoragePoolVO> allTemplatesInPool = _tmpltPoolDao.listByPoolId(pool.getId());
 		
 		for (VMTemplateStoragePoolVO templatePoolVO : allTemplatesInPool) {
-			VMTemplateVO template = _tmpltDao.findById(templatePoolVO.getTemplateId());
-			
+			VMTemplateVO template = _tmpltDao.findByIdIncludingRemoved(templatePoolVO.getTemplateId());			
+		
 			// If this is a routing template, consider it in use
-			if (template.getUniqueName().equals("routing")) {
+			if (template.getTemplateType() == TemplateType.SYSTEM) {
 				continue;
 			}
 			
@@ -976,7 +976,7 @@ public List<VMTemplateStoragePoolVO> getUnusedTemplatesInPool(StoragePoolVO pool
     @Override
     public void evictTemplateFromStoragePool(VMTemplateStoragePoolVO templatePoolVO) {
 		StoragePoolVO pool = _poolDao.findById(templatePoolVO.getPoolId());
-		VMTemplateVO template = _tmpltDao.findById(templatePoolVO.getTemplateId());
+		VMTemplateVO template = _tmpltDao.findByIdIncludingRemoved(templatePoolVO.getTemplateId());
 		
 		long hostId;
 		List<StoragePoolHostVO> poolHostVOs = _poolHostDao.listByPoolId(pool.getId());
@@ -1096,7 +1096,7 @@ public Long createInZone(long zoneId, long userId, String displayText,
 	
 	@Override
     public boolean templateIsDeleteable(VMTemplateHostVO templateHostRef) {
-		VMTemplateVO template = _tmpltDao.findById(templateHostRef.getTemplateId());
+		VMTemplateVO template = _tmpltDao.findByIdIncludingRemoved(templateHostRef.getTemplateId());
 		long templateId = template.getId();
 		HostVO secondaryStorageHost = _hostDao.findById(templateHostRef.getHostId());
 		long zoneId = secondaryStorageHost.getDataCenterId();
@@ -1284,7 +1284,7 @@ public boolean deleteTemplate(DeleteTemplateCmd cmd) {
     		throw new InvalidParameterValueException("Please specify a valid template.");
     	}
     	
-    	if (template.getUniqueName().equals("routing")) {
+    	if (template.getTemplateType() == TemplateType.SYSTEM) {
     		throw new InvalidParameterValueException("The DomR template cannot be deleted.");
     	}
     	

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,8 @@ public static enum FileSystem {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`public static enum TemplateType {`
`83`		`- SYSTEM,`
`84`		`- BUILTIN`
	`83`	`+ SYSTEM, /routing, system vm template/`
	`84`	`+ BUILTIN /buildin template/`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`public static enum StoragePoolType {`
Original file line number	Diff line number	Diff line change
`@@ -231,6 +231,7 @@`
`231`	`231`	`import com.cloud.storage.SnapshotVO;`
`232`	`232`	`import com.cloud.storage.Storage;`
`233`	`233`	`import com.cloud.storage.Storage.ImageFormat;`
	`234`	`+import com.cloud.storage.Storage.TemplateType;`
`234`	`235`	`import com.cloud.storage.StorageManager;`
`235`	`236`	`import com.cloud.storage.StoragePoolHostVO;`
`236`	`237`	`import com.cloud.storage.StoragePoolVO;`
`@@ -3723,7 +3724,7 @@ public List<VolumeVO> searchForVolumes(ListVolumesCmd cmd) throws InvalidParamet`
`3723`	`3724`	`for(VolumeVO v:allVolumes)`
`3724`	`3725`	`{`
`3725`	`3726`	`VMTemplateVO template = _templateDao.findById(v.getTemplateId());`
`3726`		`- if(template!=null && template.getUniqueName().startsWith("routing"))`
	`3727`	`+ if(template!=null && (template.getTemplateType() == TemplateType.SYSTEM))`
`3727`	`3728`	`{`
`3728`	`3729`	`//do nothing`
`3729`	`3730`	`}`