get expunged VM data for job result (#9949)

DaanHoogland · web-flow · commit a73841a693cb · 2024-11-28T17:46:01.000+01:00
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -5611,7 +5611,7 @@ public UserVm destroyVm(long vmId, boolean expunge) throws ResourceUnavailableEx
                 //Update Resource Count for the given account
                 resourceCountDecrement(vm.getAccountId(), vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));
             }
-            return _vmDao.findById(vmId);
+            return _vmDao.findByIdIncludingRemoved(vmId);
         } else {
             CloudRuntimeException ex = new CloudRuntimeException("Failed to destroy vm with specified vmId");
             ex.addProxyObject(vm.getUuid(), "vmId");

Original file line number	Diff line number	Diff line change
`@@ -5611,7 +5611,7 @@ public UserVm destroyVm(long vmId, boolean expunge) throws ResourceUnavailableEx`
`5611`	`5611`	`//Update Resource Count for the given account`
`5612`	`5612`	`resourceCountDecrement(vm.getAccountId(), vm.isDisplayVm(), new Long(offering.getCpu()), new Long(offering.getRamSize()));`
`5613`	`5613`	`}`
`5614`		`- return _vmDao.findById(vmId);`
	`5614`	`+ return _vmDao.findByIdIncludingRemoved(vmId);`
`5615`	`5615`	`} else {`
`5616`	`5616`	`CloudRuntimeException ex = new CloudRuntimeException("Failed to destroy vm with specified vmId");`
`5617`	`5617`	`ex.addProxyObject(vm.getUuid(), "vmId");`