Skip to content

kvm: fix delete of failed Instance Snapshot on stopped VM with RBD storage #14456

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
weizhouapache wants to merge 1 commit into
base: 4.22
Choose a base branch
from
+43 −1
Open

kvm: fix delete of failed Instance Snapshot on stopped VM with RBD storage #14456

Show file tree
Hide file tree
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
4 changes: 3 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 @@ -338,7 +338,9 @@ public boolean revertVMSnapshot(VMSnapshot vmSnapshot) {
@Override
public StrategyPriority canHandle(VMSnapshot vmSnapshot) {
UserVmVO userVm = userVmDao.findById(vmSnapshot.getVmId());
if (!VMSnapshot.State.Allocated.equals(vmSnapshot.getState())) {
// A snapshot that failed before any disk snapshot was taken (e.g. freeze failed) is in Error state
// without STORAGE_SNAPSHOT details. Still handle it, as the default strategy needs a libvirt domain.
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 Down
40 changes: 40 additions & 0 deletions ...hot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyKVMTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy;
import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotStrategy.SnapshotOperation;
import org.apache.cloudstack.engine.subsystem.api.storage.StorageStrategyFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.StrategyPriority;
import org.apache.cloudstack.engine.subsystem.api.storage.VMSnapshotOptions;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
Expand Down Expand Up @@ -297,6 +298,45 @@ public void testDeleteVMsnapshot() throws AgentUnavailableException, OperationTi
assertTrue(result);
}

@Test
public void testCanHandleErrorStateWithNoDiskSnapshots() {
// Simulates a failed Instance Snapshot (e.g. freeze failed before any disk snapshot was taken):
// no vm_snapshot_details/STORAGE_SNAPSHOT rows exist, but the strategy must still claim it so
// delete/cleanup does not fall back to DefaultVMSnapshotStrategy (which needs a live libvirt domain).
VMSnapshotVO vmSnapshot = Mockito.mock(VMSnapshotVO.class);
Long vmId = 1L;
UserVmVO userVmVO = Mockito.mock(UserVmVO.class);
Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId);
Mockito.when(vmSnapshot.getId()).thenReturn(1L);
Mockito.when(vmSnapshot.getState()).thenReturn(VMSnapshot.State.Error);
Mockito.when(vmSnapshot.getType()).thenReturn(VMSnapshot.Type.Disk);
Mockito.when(userVmDao.findById(vmId)).thenReturn(userVmVO);
Mockito.when(userVmVO.getHypervisorType()).thenReturn(HypervisorType.KVM);
Mockito.when(vmSnapshotDetailsDao.findDetails(ArgumentMatchers.anyLong(), ArgumentMatchers.anyString()))
.thenReturn(new ArrayList<>());

StrategyPriority priority = vmStrategy.canHandle(vmSnapshot);
assertEquals(StrategyPriority.HYPERVISOR, priority);
}

@Test
public void testCanHandleReadyStateWithNoDiskSnapshotsCantHandle() {
// A Ready snapshot with no persisted disk snapshots is inconsistent state, unrelated to the
// Error-before-any-snapshot scenario above, so the existing CANT_HANDLE behaviour is preserved.
VMSnapshotVO vmSnapshot = Mockito.mock(VMSnapshotVO.class);
Long vmId = 1L;
UserVmVO userVmVO = Mockito.mock(UserVmVO.class);
Mockito.when(vmSnapshot.getVmId()).thenReturn(vmId);
Mockito.when(vmSnapshot.getId()).thenReturn(1L);
Mockito.when(vmSnapshot.getState()).thenReturn(VMSnapshot.State.Ready);
Mockito.when(userVmDao.findById(vmId)).thenReturn(userVmVO);
Mockito.when(vmSnapshotDetailsDao.findDetails(ArgumentMatchers.anyLong(), ArgumentMatchers.anyString()))
.thenReturn(new ArrayList<>());

StrategyPriority priority = vmStrategy.canHandle(vmSnapshot);
assertEquals(StrategyPriority.CANT_HANDLE, priority);
}

@SuppressWarnings("unchecked")
private SnapshotVO testFindSnapshotByName(String snapshotName) {
SearchBuilder<SnapshotVO> sb = Mockito.mock(SearchBuilder.class);
Expand Down
Loading