Merge branch 'change-snap-backup-limitation' into '4.20.0.0-scclouds'

Mudança na limitação de criação de _backups_ e _snapshots_ incrementais

Closes #3297 and #3142

See merge request scclouds/scclouds!1363

Author: SadiJr

plugins/backup/knib/src/main/java/org/apache/cloudstack/backup/KnibBackupProvider.java

@@ -279,13 +279,6 @@ public boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backup
             return false;
         }
 
-        for (VolumeVO volume : volumeDao.findByInstance(vm.getId())) {
-            if (CollectionUtils.isNotEmpty(snapshotDataStoreDao.listReadyByVolumeIdAndCheckpointPathNotNull(volume.getId()))) {
-                logger.error("KNIB is not compatible with incremental volume snapshots.");
-                return false;
-            }
-        }
-
         for (VMSnapshotVO vmSnapshotVO : vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.Disk)) {
             List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.listDetails(vmSnapshotVO.getId());
             if (!vmSnapshotDetails.stream().allMatch(vmSnapshotDetailsVO -> vmSnapshotDetailsVO.getName().equals(VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT))) {

plugins/backup/knib/src/test/java/org/apache/cloudstack/backup/KnibBackupProviderTest.java

@@ -168,7 +168,6 @@ public void setup() {
         doReturn(vmId).when(virtualMachineMock).getId();
         doReturn(vmId).when(backupVoMock).getVmId();
         doReturn(vmId).when(nativeBackupJoinVoMock).getVmId();
-        doReturn(volumeId).when(volumeVoMock).getId();
     }
 
 
@@ -180,21 +179,8 @@ public void assignVMToBackupOfferingTestNotKvm() {
     }
 
     @Test
-    public void assignVMToBackupOfferingTestKvmWithIncrementalSnapshot() {
+    public void assignVMToBackupOfferingTestKvmWithUnsupportedDiskOnlyVmSnapshot() {
         doReturn(Hypervisor.HypervisorType.KVM).when(virtualMachineMock).getHypervisorType();
-        doReturn(List.of(volumeVoMock)).when(volumeDaoMock).findByInstance(vmId);
-        doReturn(List.of(snapshotDataStoreVoMock)).when(snapshotDataStoreDaoMock).listReadyByVolumeIdAndCheckpointPathNotNull(volumeId);
-
-
-        boolean result = knibBackupProviderSpy.assignVMToBackupOffering(virtualMachineMock, backupOfferingMock);
-        assertFalse(result);
-    }
-
-    @Test
-    public void assignVMToBackupOfferingTestKvmNoIncrementalSnapshotWithUnsupportedDiskOnlyVmSnapshot() {
-        doReturn(Hypervisor.HypervisorType.KVM).when(virtualMachineMock).getHypervisorType();
-        doReturn(List.of(volumeVoMock)).when(volumeDaoMock).findByInstance(vmId);
-        doReturn(List.of()).when(snapshotDataStoreDaoMock).listReadyByVolumeIdAndCheckpointPathNotNull(volumeId);
         doReturn(List.of(vmSnapshotVoMock)).when(vmSnapshotDaoMock).findByVmAndByType(vmId, VMSnapshot.Type.Disk);
         long vmSnapId = 921;
         doReturn(vmSnapId).when(vmSnapshotVoMock).getId();
@@ -206,10 +192,8 @@ public void assignVMToBackupOfferingTestKvmNoIncrementalSnapshotWithUnsupportedD
     }
 
     @Test
-    public void assignVMToBackupOfferingTestKvmNoIncrementalSnapshotWithSupportedDiskOnlyVmSnapshotAndDiskAndMemoryVmSnapshot() {
+    public void assignVMToBackupOfferingTestKvmWithSupportedDiskOnlyVmSnapshotAndDiskAndMemoryVmSnapshot() {
         doReturn(Hypervisor.HypervisorType.KVM).when(virtualMachineMock).getHypervisorType();
-        doReturn(List.of(volumeVoMock)).when(volumeDaoMock).findByInstance(vmId);
-        doReturn(List.of()).when(snapshotDataStoreDaoMock).listReadyByVolumeIdAndCheckpointPathNotNull(volumeId);
         doReturn(List.of(vmSnapshotVoMock)).when(vmSnapshotDaoMock).findByVmAndByType(vmId, VMSnapshot.Type.Disk);
         long vmSnapId = 921;
         doReturn(vmSnapId).when(vmSnapshotVoMock).getId();
@@ -223,10 +207,8 @@ public void assignVMToBackupOfferingTestKvmNoIncrementalSnapshotWithSupportedDis
 
 
     @Test
-    public void assignVMToBackupOfferingTestKvmNoIncrementalSnapshotWithSupportedDiskOnlyVmSnapshotAndNoDiskAndMemoryVmSnapshot() {
+    public void assignVMToBackupOfferingTestKvmWithSupportedDiskOnlyVmSnapshotAndNoDiskAndMemoryVmSnapshot() {
         doReturn(Hypervisor.HypervisorType.KVM).when(virtualMachineMock).getHypervisorType();
-        doReturn(List.of(volumeVoMock)).when(volumeDaoMock).findByInstance(vmId);
-        doReturn(List.of()).when(snapshotDataStoreDaoMock).listReadyByVolumeIdAndCheckpointPathNotNull(volumeId);
         doReturn(List.of(vmSnapshotVoMock)).when(vmSnapshotDaoMock).findByVmAndByType(vmId, VMSnapshot.Type.Disk);
         long vmSnapId = 921;
         doReturn(vmSnapId).when(vmSnapshotVoMock).getId();

server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java

@@ -59,6 +59,7 @@
 import org.apache.cloudstack.api.response.GetUploadParamsResponse;
 import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
+import org.apache.cloudstack.backup.BackupManagerImpl;
 import org.apache.cloudstack.backup.NativeBackupService;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.context.CallContext;
@@ -359,6 +360,8 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
     @Inject
     private NativeBackupService nativeBackupService;
     @Inject
+    private BackupManager backupManager;
+    @Inject
     protected VMSnapshotDetailsDao vmSnapshotDetailsDao;
     @Inject
     private StatsCollector statsCollector;
@@ -3927,6 +3930,11 @@ public Snapshot allocSnapshot(Long volumeId, Long policyId, String snapshotName,
         VirtualMachine attachedVm = volume.getAttachedVM();
         if (attachedVm != null && HypervisorType.KVM.equals(attachedVm.getHypervisorType())) {
             _userVmMgr.validateNoVmSnapshots(attachedVm);
+            if (SnapshotManager.kvmIncrementalSnapshot.valueIn(_hostDao.findClusterIdByVolumeInfo(volume)) &&
+                    backupManager.getBackupProvider(attachedVm.getDataCenterId()).getName().equals(BackupManagerImpl.KNIB_BACKUP_PROVIDER) &&
+                    CollectionUtils.isNotEmpty(backupDao.listByVmId(attachedVm.getDataCenterId(), attachedVm.getId())) ) {
+                throw new CloudRuntimeException(String.format("VM [%s] has KNIB backups, cannot take incremental snapshots of it.", attachedVm.getUuid()));
+            }
         }
 
         if (CollectionUtils.isNotEmpty(zoneIds)) {