복제 기능중 RBD, SharedMountPoint 형식의 두가지 기본스토리지에서 vm스냅샷 기능이 유지 되도록 수정

Author: jschoiRR

server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -23,6 +23,7 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -187,6 +188,9 @@
 
 @Component
 public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implements SnapshotManager, SnapshotApiService, Configurable {
+
+    private static final String KVM_STORAGE_SNAPSHOT_DETAIL = "kvmStorageSnapshot";
+    private static final String KVM_FILE_BASED_STORAGE_SNAPSHOT_DETAIL = "kvmFileBasedStorageSnapshot";
     @Inject
     VMTemplateDao _templateDao;
     @Inject
@@ -703,8 +707,8 @@ public Snapshot backupSnapshotFromVmSnapshot(Long snapshotId, Long vmId, Long vo
 
     private void updateSnapshotInfo(Long volumeId, Long vmSnapshotId, VMSnapshotVO vmSnapshot, SnapshotVO snapshot,
             SnapshotDataStoreVO snapshotOnPrimaryStore, StoragePoolVO storagePool) {
-        if ((storagePool.getPoolType() == StoragePoolType.NetworkFilesystem || storagePool.getPoolType() == StoragePoolType.Filesystem) && vmSnapshot.getType() == VMSnapshot.Type.Disk) {
-            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.findDetails(vmSnapshotId, "kvmStorageSnapshot");
+        if (isFileBasedKvmPrimaryPool(storagePool.getPoolType()) && vmSnapshot.getType() == VMSnapshot.Type.Disk) {
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = getVmSnapshotVolumeDetails(vmSnapshotId);
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : vmSnapshotDetails) {
                 SnapshotInfo sInfo = snapshotDataFactory.getSnapshot(Long.parseLong(vmSnapshotDetailsVO.getValue()), storagePool.getId(), DataStoreRole.Primary);
                 if (sInfo.getVolumeId() == volumeId) {
@@ -722,6 +726,30 @@ private void updateSnapshotInfo(Long volumeId, Long vmSnapshotId, VMSnapshotVO v
         }
     }
 
+    private boolean isFileBasedKvmPrimaryPool(StoragePoolType poolType) {
+        return poolType == StoragePoolType.NetworkFilesystem
+                || poolType == StoragePoolType.Filesystem
+                || poolType == StoragePoolType.SharedMountPoint;
+    }
+
+    private List<VMSnapshotDetailsVO> getVmSnapshotVolumeDetails(Long vmSnapshotId) {
+        List<VMSnapshotDetailsVO> details = new ArrayList<>();
+        Set<String> uniqueSnapshotIds = new LinkedHashSet<>();
+        for (String detailName : List.of(KVM_STORAGE_SNAPSHOT_DETAIL, KVM_FILE_BASED_STORAGE_SNAPSHOT_DETAIL)) {
+            List<VMSnapshotDetailsVO> found = vmSnapshotDetailsDao.findDetails(vmSnapshotId, detailName);
+            if (CollectionUtils.isEmpty(found)) {
+                continue;
+            }
+            for (VMSnapshotDetailsVO detail : found) {
+                if (detail == null || !uniqueSnapshotIds.add(detail.getValue())) {
+                    continue;
+                }
+                details.add(detail);
+            }
+        }
+        return details;
+    }
+
     @Override
     public SnapshotVO getParentSnapshot(VolumeInfo volume) {
         long preId = _snapshotDao.getLastSnapshot(volume.getId(), DataStoreRole.Primary);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -443,6 +443,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
 
     private static final String VM_IMPORT_DEFAULT_TEMPLATE_NAME = "system-default-vm-import-dummy-template.iso";
     private static final String KVM_VM_IMPORT_DEFAULT_TEMPLATE_NAME = "kvm-default-vm-import-dummy-template";
+    private static final String KVM_STORAGE_SNAPSHOT_DETAIL = "kvmStorageSnapshot";
+    private static final String KVM_FILE_BASED_STORAGE_SNAPSHOT_DETAIL = "kvmFileBasedStorageSnapshot";
 
     @Inject
     private EntityManager _entityMgr;
@@ -10704,7 +10706,10 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot: " + e.getMessage(), e);
         }
 
-        List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
+        List<VMSnapshotDetailsVO> listSnapshots = getVmSnapshotVolumeDetails(vmSnapshot.getId());
+        if (CollectionUtils.isEmpty(listSnapshots)) {
+            throw new CloudRuntimeException("Could not find volume snapshots mapped to VM snapshot");
+        }
 
         Integer countOfCloneVM = cmd.getCount();
         for (int cnt = 1; cnt <= countOfCloneVM; cnt++) {
@@ -10823,6 +10828,24 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         return null;
     }
 
+    private List<VMSnapshotDetailsVO> getVmSnapshotVolumeDetails(Long vmSnapshotId) {
+        List<VMSnapshotDetailsVO> details = new ArrayList<>();
+        Set<String> uniqueSnapshotIds = new LinkedHashSet<>();
+        for (String detailName : List.of(KVM_STORAGE_SNAPSHOT_DETAIL, KVM_FILE_BASED_STORAGE_SNAPSHOT_DETAIL)) {
+            List<VMSnapshotDetailsVO> found = vmSnapshotDetailsDao.findDetails(vmSnapshotId, detailName);
+            if (CollectionUtils.isEmpty(found)) {
+                continue;
+            }
+            for (VMSnapshotDetailsVO detail : found) {
+                if (detail == null || !uniqueSnapshotIds.add(detail.getValue())) {
+                    continue;
+                }
+                details.add(detail);
+            }
+        }
+        return details;
+    }
+
     public UserVm createCloneVM(CloneVMCmd cmd, Long rootVolumeId) throws ConcurrentOperationException, ResourceAllocationException, InsufficientCapacityException, ResourceUnavailableException {
         //network configurations and check, then create the template
         UserVm curVm = cmd.getTargetVM();