fallback to full snapshots for clvm-ng - incremental not supported in 4.23

Author: Pearl Dsilva

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java

@@ -2132,11 +2132,13 @@ private SnapshotObjectTO takeIncrementalVolumeSnapshotOfStoppedVm(SnapshotObject
                 ObjectUtils.defaultIfNull(secondaryPool, primaryPool));
         try {
             // For CLVM_NG incremental snapshots, validate bitmap before proceeding
+            /*
             SnapshotObjectTO bitmapValidationResult = validateClvmNgBitmapAndFallbackIfNeeded(snapshotObjectTO, primaryPool,
                     secondaryPool, secondaryPoolUrl, snapshotName, volumeObjectTo, conn, wait);
             if (bitmapValidationResult != null) {
                 return bitmapValidationResult;
             }
+             */
 
             String vmName = String.format("DUMMY-VM-%s", snapshotName);
 

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

@@ -1634,9 +1634,8 @@ public SnapshotInfo takeSnapshot(VolumeInfo volume) throws ResourceAllocationExc
         boolean backupSnapToSecondary = isBackupSnapshotToSecondaryForZone(volume.getDataCenterId());
 
         StoragePoolType poolType = volume.getStoragePoolType();
-        boolean isClvmNgIncrementalCandidate = StoragePoolType.CLVM_NG == poolType
-                && kvmIncrementalSnapshot.valueIn(clusterId);
-        if ((isKvmAndFileBasedStorage || isClvmNgIncrementalCandidate) && backupSnapToSecondary) {
+
+        if ((isKvmAndFileBasedStorage) && backupSnapToSecondary) {
             DataStore imageStore = snapshotSrv.findSnapshotImageStore(snapshot);
             if (imageStore == null) {
                 throw new CloudRuntimeException(String.format("Could not find any secondary storage to allocate snapshot [%s].", snapshot));
@@ -1660,7 +1659,7 @@ public SnapshotInfo takeSnapshot(VolumeInfo volume) throws ResourceAllocationExc
             SnapshotInfo snapshotOnPrimary = snapshotStrategy.takeSnapshot(snapshot);
 
             if (backupSnapToSecondary) {
-                if (!isKvmAndFileBasedStorage && !isClvmNgIncrementalCandidate) {
+                if (!isKvmAndFileBasedStorage) {
                     backupSnapshotToSecondary(payload.getAsyncBackup(), snapshotStrategy, snapshotOnPrimary, payload.getZoneIds(), payload.getStoragePoolIds());
                     if (storagePool.getPoolType() == StoragePoolType.CLVM || storagePool.getPoolType() == StoragePoolType.CLVM_NG) {
                         _snapshotStoreDao.removeBySnapshotStore(snapshotId, snapshotOnPrimary.getDataStore().getId(), snapshotOnPrimary.getDataStore().getRole());
@@ -1860,7 +1859,8 @@ private void updateSnapshotPayload(long storagePoolId, CreateSnapshotPayload pay
             payload.setLocationType(null);
         }
 
-        if ((isKvmAndFileBasedStorage || StoragePoolType.CLVM_NG == poolType) && kvmIncrementalSnapshot.valueIn(clusterId)) {
+        // CLVM_NG excluded: incremental snapshots not supported in this release (handled in takeSnapshot).
+        if (isKvmAndFileBasedStorage && kvmIncrementalSnapshot.valueIn(clusterId)) {
             payload.setKvmIncrementalSnapshot(true);
         }
     }