CLOUDSTACK-8119. Propagate error message to UI for attach/detach volume failure operations.

Likitha Shetty · Likitha Shetty · commit 4d7ede535df5 · 2014-12-24T11:29:03.000+05:30
For AttachVolume/DetachVolume API command, improve user error message in case of RuntimeException by throwing the exception instead of 'Unexpected Exception'.
diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
@@ -1367,7 +1367,11 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean
                 hostService.invalidateServiceContext(null);
             }
 
-            String msg = "AttachVolumeCommand failed due to " + VmwareHelper.getExceptionMessage(e);
+            String msg = "";
+            if (isAttach)
+                msg += "Failed to attach volume: " + e.getMessage();
+            else
+                msg += "Failed to detach volume: " + e.getMessage();
             s_logger.error(msg, e);
             return new AttachAnswer(msg);
         }
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1378,6 +1378,8 @@ public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId) {
                     throw (ConcurrentOperationException)jobResult;
                 else if (jobResult instanceof InvalidParameterValueException)
                     throw (InvalidParameterValueException)jobResult;
+                else if (jobResult instanceof RuntimeException)
+                    throw (RuntimeException)jobResult;
                 else if (jobResult instanceof Throwable)
                     throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
                 else if (jobResult instanceof Long) {
@@ -1580,6 +1582,8 @@ public Volume detachVolumeFromVM(DetachVolumeCmd cmmd) {
             if (jobResult != null) {
                 if (jobResult instanceof ConcurrentOperationException)
                     throw (ConcurrentOperationException)jobResult;
+                else if (jobResult instanceof RuntimeException)
+                    throw (RuntimeException)jobResult;
                 else if (jobResult instanceof Throwable)
                     throw new RuntimeException("Unexpected exception", (Throwable)jobResult);
                 else if (jobResult instanceof Long) {
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java
@@ -1126,6 +1126,14 @@ public List<Pair<String, ManagedObjectReference>> detachDisk(String vmdkDatastor
             throw new Exception("No such disk device: " + vmdkDatastorePath);
         }
 
+        // IDE virtual disk cannot be detached if VM is running
+        if (deviceInfo.second() != null && deviceInfo.second().contains("ide")) {
+            if (getPowerState() == VirtualMachinePowerState.POWERED_ON) {
+                throw new Exception("Removing a virtual disk over IDE controller is not supported while VM is running in VMware hypervisor. " +
+                        "Please re-try when VM is not running.");
+            }
+        }
+
         List<Pair<String, ManagedObjectReference>> chain = getDiskDatastorePathChain(deviceInfo.first(), true);
 
         VirtualMachineConfigSpec reConfigSpec = new VirtualMachineConfigSpec();

Original file line number	Diff line number	Diff line change
`@@ -1367,7 +1367,11 @@ private Answer attachVolume(Command cmd, DiskTO disk, boolean isAttach, boolean`
`1367`	`1367`	`hostService.invalidateServiceContext(null);`
`1368`	`1368`	`}`
`1369`	`1369`
`1370`		`- String msg = "AttachVolumeCommand failed due to " + VmwareHelper.getExceptionMessage(e);`
	`1370`	`+ String msg = "";`
	`1371`	`+ if (isAttach)`
	`1372`	`+ msg += "Failed to attach volume: " + e.getMessage();`
	`1373`	`+ else`
	`1374`	`+ msg += "Failed to detach volume: " + e.getMessage();`
`1371`	`1375`	`s_logger.error(msg, e);`
`1372`	`1376`	`return new AttachAnswer(msg);`
`1373`	`1377`	`}`