Skip to content

Allow creating snapshot from VM snapshot #4739

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
nvazquez merged 1 commit into from
Apr 14, 2022
Merged

Allow creating snapshot from VM snapshot #4739

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: 4 additions & 0 deletions api/src/main/java/com/cloud/storage/snapshot/SnapshotApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,10 @@ public interface SnapshotApiService {

Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType) throws ResourceAllocationException;

Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType, Boolean isFromVmSnapshot)
throws ResourceAllocationException;


/**
* Create a snapshot of a volume
*
Expand Down
4 changes: 2 additions & 2 deletions server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3289,7 +3289,7 @@ public Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName,
throw new InvalidParameterValueException("VolumeId: " + volumeId + " please attach this volume to a VM before create snapshot for it");
}

return snapshotMgr.allocSnapshot(volumeId, policyId, snapshotName, locationType);
return snapshotMgr.allocSnapshot(volumeId, policyId, snapshotName, locationType, false);
}

@Override
Expand Down Expand Up @@ -3345,7 +3345,7 @@ public Snapshot allocSnapshotForVm(Long vmId, Long volumeId, String snapshotName
throw new InvalidParameterValueException("Cannot perform this operation, unsupported on storage pool type " + storagePool.getPoolType());
}

return snapshotMgr.allocSnapshot(volumeId, Snapshot.MANUAL_POLICY_ID, snapshotName, null);
return snapshotMgr.allocSnapshot(volumeId, Snapshot.MANUAL_POLICY_ID, snapshotName, null, true);
}

@Override
Expand Down
15 changes: 10 additions & 5 deletions server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1124,7 +1124,7 @@ private Type getSnapshotType(IntervalType intvType) {
return null;
}

private boolean hostSupportSnapsthotForVolume(HostVO host, VolumeInfo volume) {
private boolean hostSupportsSnapsthotForVolume(HostVO host, VolumeInfo volume, boolean isFromVmSnapshot) {
if (host.getHypervisorType() != HypervisorType.KVM) {
return true;
}
Expand All @@ -1136,7 +1136,7 @@ private boolean hostSupportSnapsthotForVolume(HostVO host, VolumeInfo volume) {
VMInstanceVO vm = _vmDao.findById(vmId);
if (vm.getState() != VirtualMachine.State.Stopped && vm.getState() != VirtualMachine.State.Destroyed) {
boolean snapshotEnabled = Boolean.parseBoolean(_configDao.getValue("kvm.snapshot.enabled"));
if (!snapshotEnabled) {
if (!snapshotEnabled && !isFromVmSnapshot) {
s_logger.debug("Snapshot is not supported on host " + host + " for the volume " + volume + " attached to the vm " + vm);
return false;
}
Expand All @@ -1157,7 +1157,7 @@ private boolean hostSupportSnapsthotForVolume(HostVO host, VolumeInfo volume) {
return false;
}

private boolean supportedByHypervisor(VolumeInfo volume) {
private boolean supportedByHypervisor(VolumeInfo volume, boolean isFromVmSnapshot) {
HypervisorType hypervisorType;
StoragePoolVO storagePool = _storagePoolDao.findById(volume.getDataStore().getId());
ScopeType scope = storagePool.getScope();
Expand All @@ -1181,7 +1181,7 @@ private boolean supportedByHypervisor(VolumeInfo volume) {
}
if (hosts != null && !hosts.isEmpty()) {
HostVO host = hosts.get(0);
if (!hostSupportSnapsthotForVolume(host, volume)) {
if (!hostSupportsSnapsthotForVolume(host, volume, isFromVmSnapshot)) {
throw new CloudRuntimeException(
"KVM Snapshot is not supported for Running VMs. It is disabled by default due to a possible volume corruption in certain cases. To enable it set global settings kvm.snapshot.enabled to True. See the documentation for more details.");
}
Expand Down Expand Up @@ -1489,9 +1489,14 @@ public void cleanupSnapshotsByVolume(Long volumeId) {

@Override
public Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType) throws ResourceAllocationException {
return allocSnapshot(volumeId, policyId, snapshotName, locationType, false);
}

@Override
public Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName, Snapshot.LocationType locationType, Boolean isFromVmSnapshot) throws ResourceAllocationException {
Account caller = CallContext.current().getCallingAccount();
VolumeInfo volume = volFactory.getVolume(volumeId);
supportedByHypervisor(volume);
supportedByHypervisor(volume, isFromVmSnapshot);

// Verify permissions
_accountMgr.checkAccess(caller, null, true, volume);
Expand Down