This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.19 by this push:
new a73841a693c get expunged VM data for job result (#9949)
a73841a693c is described below
commit a73841a693cb6ce0281bce8aa8de3d675480f322
Author: dahn <[email protected]>
AuthorDate: Thu Nov 28 17:46:01 2024 +0100
get expunged VM data for job result (#9949)
---
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 9d5a1be894b..6e75512948a 100644
--- 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 class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
//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");