bug CS-14739: Check for the volume and vm hypervisor compatibility before attaching the volume to vm in case the volume is on secondary storage.

nitinmeh · nitinmeh · commit 0d2422720b07 · 2012-05-04T17:29:22.000+05:30
diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java
@@ -33,7 +33,7 @@ enum State {
         Expunging("The volume is being expunging"),
         Destroy("The volume is destroyed, and can't be recovered."),        
         Uploading ("The volume upload is in progress"),
-        Uploaded ("The volume is uploaded"),
+        Uploaded ("The volume is uploaded and present on secondary storage"),
         UploadError ("The volume couldnt be uploaded");
 
         String _description;
diff --git a/server/src/com/cloud/storage/StorageManager.java b/server/src/com/cloud/storage/StorageManager.java
@@ -226,4 +226,6 @@ VolumeVO copyVolumeFromSecToPrimary(VolumeVO volume, VMInstanceVO vm,
 			Long clusterId, ServiceOfferingVO offering,
 			DiskOfferingVO diskOffering, List<StoragePoolVO> avoids, long size,
 			HypervisorType hyperType) throws NoTransitionException;
+
+	String getSupportedImageFormatForCluster(Long clusterId);
 }
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -3802,4 +3802,21 @@ public List<VolumeVO> searchForVolumes(ListVolumesCmd cmd) {
         return _volumeDao.search(sc, searchFilter);
     }
 
+    @Override
+    public String getSupportedImageFormatForCluster(Long clusterId) {
+        ClusterVO cluster = ApiDBUtils.findClusterById(clusterId);
+
+        if (cluster.getHypervisorType() == HypervisorType.XenServer) {
+            return "vhd";
+        } else if (cluster.getHypervisorType() == HypervisorType.KVM) {
+            return "qcow2";
+        } else if (cluster.getHypervisorType() == HypervisorType.VMware) {
+            return "ova";
+        } else if (cluster.getHypervisorType() == HypervisorType.Ovm) {
+            return "raw";
+        } else {
+            return null;
+        }
+    }
+    
 }
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -590,6 +590,11 @@ public Volume attachVolumeToVM(AttachVolumeCmd command) {
             	volume = _storageMgr.createVolume(volume, vm, rootDiskTmplt, dcVO, pod, rootDiskPool.getClusterId(), svo, diskVO, new ArrayList<StoragePoolVO>(), volume.getSize(), rootDiskHyperType);
             }else {
             	try {
+                	// Format of data disk should be the same as root disk
+                	if(_storageMgr.getSupportedImageFormatForCluster(rootDiskPool.getClusterId()) != volHostVO.getFormat().getFileExtension()){
+                		throw new InvalidParameterValueException("Failed to attach volume to VM since volumes format " +volHostVO.getFormat().getFileExtension()+
+                				" is not compatible with the vm hypervisor type" );
+                	}
 					volume = _storageMgr.copyVolumeFromSecToPrimary(volume, vm, rootDiskTmplt, dcVO, pod, rootDiskPool.getClusterId(), svo, diskVO, new ArrayList<StoragePoolVO>(), volume.getSize(), rootDiskHyperType);
 				} catch (NoTransitionException e) {				
 					e.printStackTrace();

Original file line number	Diff line number	Diff line change
`@@ -226,4 +226,6 @@ VolumeVO copyVolumeFromSecToPrimary(VolumeVO volume, VMInstanceVO vm,`
`226`	`226`	`Long clusterId, ServiceOfferingVO offering,`
`227`	`227`	`DiskOfferingVO diskOffering, List<StoragePoolVO> avoids, long size,`
`228`	`228`	`HypervisorType hyperType) throws NoTransitionException;`
	`229`	`+`
	`230`	`+ String getSupportedImageFormatForCluster(Long clusterId);`
`229`	`231`	`}`