Cleanup the created VM if restore fails afterwards.

Author: abh1sar

api/src/main/java/org/apache/cloudstack/api/command/user/vm/BaseDeployVMCmd.java

@@ -533,7 +533,7 @@ public List<DiskOfferingInfo> getDataDiskOfferingsInfo() {
             HashMap<String, String> dataDisk = (HashMap<String, String>)iter.next();
             String diskOfferingUuid = dataDisk.get(ApiConstants.DISK_OFFERING_ID);
             if (diskOfferingUuid == null) {
-                throw new InvalidParameterValueException("Disk offering id is required for data disk");
+                throw new InvalidParameterValueException("diskofferingid parameter is required for datadiskdetails");
             }
             DiskOffering diskOffering = _entityMgr.findByUuid(DiskOffering.class, diskOfferingUuid);
             if (diskOffering == null) {
@@ -546,6 +546,9 @@ public List<DiskOfferingInfo> getDataDiskOfferingsInfo() {
             Long size = null;
             Long minIops = null;
             Long maxIops = null;
+            if (dataDisk.get(ApiConstants.DEVICE_ID) == null) {
+                throw new InvalidParameterValueException("deviceid parameter is required for datadiskdetails");
+            }
             Long deviceId = Long.parseLong(dataDisk.get(ApiConstants.DEVICE_ID));
             if (diskOffering.isCustomized()) {
                 if (dataDisk.get(ApiConstants.SIZE) == null) {

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -9480,16 +9480,31 @@ public UserVm restoreVMFromBackup(CreateVMFromBackupCmd cmd) throws ResourceUnav
         long vmId = cmd.getEntityId();
         Map<Long, DiskOffering> diskOfferingMap = cmd.getDataDiskTemplateToDiskOfferingMap();
         Map<VirtualMachineProfile.Param, Object> additonalParams = new HashMap<>();
-        UserVm vm = startVirtualMachine(vmId, null, null, null, diskOfferingMap, additonalParams, null);
+        UserVm vm;
 
-        boolean status = false;
-        status =  stopVirtualMachine(CallContext.current().getCallingUserId(), vm.getId()) ;
-        if (!status) {
-            expungeVm(vm.getId());
-            throw new CloudRuntimeException("Unable to stop the instance before restore ");
-        }
+        try {
+            vm = startVirtualMachine(vmId, null, null, null, diskOfferingMap, additonalParams, null);
+
+            boolean status =  stopVirtualMachine(CallContext.current().getCallingUserId(), vm.getId()) ;
+            if (!status) {
+                UserVmVO vmVO = _vmDao.findById(vmId);
+                expunge(vmVO);
+                logger.debug("Successfully cleaned up VM {} after create instance from backup failed", vmId);
+                throw new CloudRuntimeException("Unable to stop the instance before restore");
+            }
+
+            backupManager.restoreBackupToVM(cmd.getBackupId(), vmId);
 
-        backupManager.restoreBackupToVM(cmd.getBackupId(), vmId);
+        } catch (Exception e) {
+            UserVmVO vmVO = _vmDao.findById(vmId);
+            try {
+                expunge(vmVO);
+                logger.debug("Successfully cleaned up VM {} after create instance from backup failed", vmId);
+            } catch (Exception cleanupException) {
+                logger.debug("Failed to cleanup VM {} after create instance from backup failed", vmId, cleanupException);
+            }
+            throw e;
+        }
 
         Account owner = _accountService.getActiveAccountById(cmd.getEntityOwnerId());
         UserVmVO userVm = _vmDao.findById(vmId);