Skip to content

fix: handle failed storage VM snapshot cleanup in StorageVMSnapshotStrategy #13976

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

Open
waterWang wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: handle failed storage VM snapshot cleanup in StorageVMSnapshotStrategy #13976

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 17 additions & 1 deletion ...hot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,10 @@ public boolean revertVMSnapshot(VMSnapshot vmSnapshot) {
@Override
public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
UserVmVO userVm = userVmDao.findById(vmSnapshot.getVmId());
if (!VMSnapshot.State.Allocated.equals(vmSnapshot.getState())) {
// Failed (Error) storage snapshots do not have the STORAGE_SNAPSHOT detail persisted, as the
// details are removed during the creation rollback. They still need to be handled by this
// strategy so their database records can be cleaned up without requiring access to the VM.
if (!VMSnapshot.State.Allocated.equals(vmSnapshot.getState()) && !VMSnapshot.State.Error.equals(vmSnapshot.getState())) {
List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), STORAGE_SNAPSHOT);
if (CollectionUtils.isEmpty(vmSnapshotDetails)) {
return StrategyPriority.CANT_HANDLE;
Expand All @@ -364,6 +367,19 @@ public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
return StrategyPriority.CANT_HANDLE;
}

@Override
public boolean deleteVMSnapshot(VMSnapshot vmSnapshot) {
// A failed (Error) storage snapshot has no underlying storage snapshot to delete: the
// takeVMSnapshot rollback already removed any snapshots that were created before the
// failure. Sending DeleteVMSnapshotCommand to the hypervisor would fail for a stopped VM
// with RAW/RBD volumes because no libvirt domain exists. Clean up the database record
// directly instead.
if (VMSnapshot.State.Error.equals(vmSnapshot.getState())) {
return deleteVMSnapshotFromDB(vmSnapshot, false);
}
return super.deleteVMSnapshot(vmSnapshot);
}

@Override
public StrategyPriority canHandle(Long vmId, Long rootPoolId, boolean snapshotMemory) {
UserVmVO vm = userVmDao.findById(vmId);
Expand Down