Skip to content

get expunged VM data for job result #9949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 28, 2024
Merged

get expunged VM data for job result #9949

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f85033
get expunged VM data for job result
DaanHoogland Nov 20, 2024
a37dc98
only find including removed after destroy
DaanHoogland Nov 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5569,7 +5569,7 @@ private Host getDestinationHost(Long hostId, boolean isRootAdmin, boolean isExpl
@Override
public UserVm destroyVm(long vmId, boolean expunge) throws ResourceUnavailableException, ConcurrentOperationException {
// Verify input parameters
UserVmVO vm = _vmDao.findById(vmId);
UserVmVO vm = _vmDao.findByIdIncludingRemoved(vmId);
if (vm == null || vm.getRemoved() != null) {
InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find a virtual machine with specified vmId");
throw ex;
Expand Down Expand Up @@ -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");
Expand Down
Loading