From 6f2011374f4e2c06a2c09e4930f4fa86fab7fae2 Mon Sep 17 00:00:00 2001
From: Pearl Dsilva <pearl1594@gmail.com>
Date: Fri, 20 Feb 2026 07:50:55 -0500
Subject: [PATCH] add support to revert snapshot for clvm

---
 .../snapshot/DefaultSnapshotStrategy.java     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
index 7174336113b..2ea2b3721d1 100644
--- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
+++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
@@ -643,6 +643,11 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
                 return StrategyPriority.DEFAULT;
             }
 
+            // Check if this is a CLVM volume with snapshot backed up to secondary storage
+            if (isSnapshotStoredOnSecondaryForCLVMVolume(snapshot, volumeVO)) {
+                return StrategyPriority.DEFAULT;
+            }
+
             return StrategyPriority.CANT_HANDLE;
         }
         if (zoneId != null && SnapshotOperation.DELETE.equals(op)) {
@@ -691,4 +696,32 @@ public class DefaultSnapshotStrategy extends SnapshotStrategyBase {
                         dataStoreMgr.getStoreZoneId(s.getDataStoreId(), s.getRole()), volumeVO.getDataCenterId()));
     }
 
+    /**
+     * Checks if a CLVM volume snapshot is stored on secondary storage in the same zone.
+     * CLVM snapshots are backed up to secondary storage and removed from primary storage.
+     */
+    protected boolean isSnapshotStoredOnSecondaryForCLVMVolume(Snapshot snapshot, VolumeVO volumeVO) {
+        if (volumeVO == null) {
+            return false;
+        }
+
+        Long poolId = volumeVO.getPoolId();
+        if (poolId == null) {
+            return false;
+        }
+
+        StoragePool pool = (StoragePool) dataStoreMgr.getDataStore(poolId, DataStoreRole.Primary);
+        if (pool == null || pool.getPoolType() != StoragePoolType.CLVM) {
+            return false;
+        }
+
+        List<SnapshotDataStoreVO> snapshotStores = snapshotStoreDao.listReadyBySnapshot(snapshot.getId(), DataStoreRole.Image);
+        if (CollectionUtils.isEmpty(snapshotStores)) {
+            return false;
+        }
+
+        return snapshotStores.stream().anyMatch(s -> Objects.equals(
+                dataStoreMgr.getStoreZoneId(s.getDataStoreId(), s.getRole()), volumeVO.getDataCenterId()));
+    }
+
 }