From 3b6b63866d7a6c1af69dc34e2fb7523ca099c944 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 14:32:25 +0900
Subject: [PATCH 01/93] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 7 +++----
 ui/src/views/compute/CloneVM.vue                         | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 2e86b8fb7c26..e19eb7f7c942 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -77,7 +77,6 @@
 import org.apache.cloudstack.api.command.admin.vm.DeployVMVolumeCmdByAdmin;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
-import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.CreateVMFromBackupCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vm.DeployVMCmdByAdmin;
@@ -10684,18 +10683,18 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         try {
             vmSnapshot = _vmSnapshotMgr.allocVMSnapshot(curVm.getId(), null, null, false);
             if (vmSnapshot == null) {
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot");
+                throw new CloudRuntimeException("Failed to create vm snapshot");
             }
             vmSnapshot = _vmSnapshotMgr.createVMSnapshot(curVm.getId(), vmSnapshot.getId(), false);
             if (vmSnapshot == null) {
-                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
+                throw new CloudRuntimeException("Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
             }
 
         } catch (CloudRuntimeException e) {
             if(vmSnapshot != null){
                 _vmSnapshotMgr.deleteVMSnapshot(vmSnapshot.getId());
             }
-            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot: " + e.getMessage(), e);
+            throw new CloudRuntimeException("Failed to create vm snapshot: " + e.getMessage(), e);
         }
 
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
diff --git a/ui/src/views/compute/CloneVM.vue b/ui/src/views/compute/CloneVM.vue
index 679f411ea179..e1e6bc9303ac 100644
--- a/ui/src/views/compute/CloneVM.vue
+++ b/ui/src/views/compute/CloneVM.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import { ref, reactive, toRaw } from 'vue'
-import { getAPI } from '@/api'
+import { postAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 
 export default {
@@ -121,7 +121,7 @@ export default {
           params.clonetype = null
         }
         // console.log(params)
-        getAPI('cloneVirtualMachine', params).then(json => {
+        postAPI('cloneVirtualMachine', params).then(json => {
           const jobId = json.clonevirtualmachineresponse.jobid
           this.$pollJob({
             jobId,

From 461fb9a4c28c29d9511e1f7ba9961f5b8ac5a09b Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 14:40:34 +0900
Subject: [PATCH 02/93] Update UserVmManagerImpl.java

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index e19eb7f7c942..20b34692e5e2 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -73,7 +73,6 @@
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.command.admin.vm.DeployVMVolumeCmdByAdmin;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;

From c54d0e7b56a30cf185df5ece76d7c38eb6ca930c Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 15:03:27 +0900
Subject: [PATCH 03/93] Update UserVmManagerImpl.java

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 20b34692e5e2..c1847b83625d 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10681,15 +10681,17 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         VMSnapshot vmSnapshot = null;
         try {
             vmSnapshot = _vmSnapshotMgr.allocVMSnapshot(curVm.getId(), null, null, false);
+            logger.info("UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
             if (vmSnapshot == null) {
                 throw new CloudRuntimeException("Failed to create vm snapshot");
             }
             vmSnapshot = _vmSnapshotMgr.createVMSnapshot(curVm.getId(), vmSnapshot.getId(), false);
+            logger.info("UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
             if (vmSnapshot == null) {
                 throw new CloudRuntimeException("Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
             }
-
         } catch (CloudRuntimeException e) {
+            logger.info("UserVmManagerImpl.java CloudRuntimeException vmSnapshot :" + vmSnapshot);
             if(vmSnapshot != null){
                 _vmSnapshotMgr.deleteVMSnapshot(vmSnapshot.getId());
             }

From 0ca104182abfb98ce7900f01c464c0420987c745 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 15:28:29 +0900
Subject: [PATCH 04/93] Update UserVmManagerImpl.java

---
 .../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index c1847b83625d..79c619f75f59 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10681,23 +10681,26 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         VMSnapshot vmSnapshot = null;
         try {
             vmSnapshot = _vmSnapshotMgr.allocVMSnapshot(curVm.getId(), null, null, false);
-            logger.info("UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
+            logger.info("1111UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
             if (vmSnapshot == null) {
                 throw new CloudRuntimeException("Failed to create vm snapshot");
             }
             vmSnapshot = _vmSnapshotMgr.createVMSnapshot(curVm.getId(), vmSnapshot.getId(), false);
-            logger.info("UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
+            logger.info("2222UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
             if (vmSnapshot == null) {
                 throw new CloudRuntimeException("Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
             }
         } catch (CloudRuntimeException e) {
             logger.info("UserVmManagerImpl.java CloudRuntimeException vmSnapshot :" + vmSnapshot);
+            logger.info("3333UserVmManagerImpl.java CloudRuntimeException vmSnapshot :" + vmSnapshot);
             if(vmSnapshot != null){
                 _vmSnapshotMgr.deleteVMSnapshot(vmSnapshot.getId());
             }
             throw new CloudRuntimeException("Failed to create vm snapshot: " + e.getMessage(), e);
         }
 
+        logger.info("4444UserVmManagerImpl.java");
+
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
 
         Integer countOfCloneVM = cmd.getCount();
@@ -10705,7 +10708,9 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
             cmd.setName(orgName + (countOfCloneVM > 1 ? Integer.toString(cnt) : ""));
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : listSnapshots) {
                 SnapshotVO snapVO = _snapshotDao.findById(Long.parseLong(vmSnapshotDetailsVO.getValue()));
+                logger.info("4444-1UserVmManagerImpl.java");
                 if (snapVO == null) {
+                    logger.info("4444-2UserVmManagerImpl.java");
                     throw new CloudRuntimeException("Could not find snapshot for VM snapshot");
                 }
 
@@ -10718,16 +10723,20 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                 Storage.ProvisioningType provisioningType = diskOffering.getProvisioningType();
                 String rootVolumeName = cmd.getName() + "-" + parentRootVolume.getName();
                 if (parentRootVolume.getVolumeType() == Volume.Type.ROOT) {
+                    logger.info("4444-3UserVmManagerImpl.java");
                     if (StringUtils.isNotBlank(clone_type)){
                         snapVO.setCloneType(clone_type);
                         _snapshotDao.update(snapVO.getId(), snapVO);
                     }
+                    logger.info("4444-4UserVmManagerImpl.java");
                     VolumeVO newVol = cloneVolumeFromSnapToDB(curVmAccount, true, zoneId, diskOfferingId, provisioningType, size, minIops, maxIops, parentRootVolume, rootVolumeName,
                                                                         _uuidMgr.generateUuid(Volume.class, null), new HashMap<>(), Volume.Type.ROOT, 0L);
+                    logger.info("4444-5UserVmManagerImpl.java");
                     VolumeVO rootVolume = (VolumeVO) _volumeService.cloneVolumeFromSnapshot(newVol, snapVO.getId(), curVm.getId());
                     if (rootVolume == null) {
                         throw new CloudRuntimeException("Creation of root volume is not queried. The virtual machine cannot be cloned!");
                     }
+                    logger.info("4444-6UserVmManagerImpl.java");
                     UserVm cloneVM = createCloneVM(cmd, rootVolume.getId());
                     if (cloneVM == null) {
                         throw new CloudRuntimeException("Unable to record the VM to DB!");
@@ -10741,6 +10750,8 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                     break;
                 }
             }
+            logger.info("5555UserVmManagerImpl.java");
+
 
             List<VolumeVO> createdVolumes = new ArrayList<>();
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : listSnapshots) {

From fed3ef162566c38d56f3354cd9f3f6f78c535dbf Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 15:54:50 +0900
Subject: [PATCH 05/93] Update UserVmManagerImpl.java

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 79c619f75f59..20a8b0b1026a 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10702,13 +10702,15 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         logger.info("4444UserVmManagerImpl.java");
 
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
-
+        logger.info("4444UserVmManagerImpl.java listSnapshots" + listSnapshots);
         Integer countOfCloneVM = cmd.getCount();
+        logger.info("4444UserVmManagerImpl.java countOfCloneVM start" + countOfCloneVM);
         for (int cnt = 1; cnt <= countOfCloneVM; cnt++) {
+            logger.info("4444-1UserVmManagerImpl.java");
             cmd.setName(orgName + (countOfCloneVM > 1 ? Integer.toString(cnt) : ""));
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : listSnapshots) {
                 SnapshotVO snapVO = _snapshotDao.findById(Long.parseLong(vmSnapshotDetailsVO.getValue()));
-                logger.info("4444-1UserVmManagerImpl.java");
+                logger.info("4444-11UserVmManagerImpl.java");
                 if (snapVO == null) {
                     logger.info("4444-2UserVmManagerImpl.java");
                     throw new CloudRuntimeException("Could not find snapshot for VM snapshot");
@@ -10825,6 +10827,7 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                 }
             }
         }
+        logger.info("4444UserVmManagerImpl.java countOfCloneVM end" + countOfCloneVM);
         return null;
     }
 

From 05f3c29f93cf0eb4ef7cf050b2e14e897bb73013 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 16:15:27 +0900
Subject: [PATCH 06/93] Update UserVmManagerImpl.java

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 20a8b0b1026a..84fadbaaa9c9 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10709,14 +10709,16 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
             logger.info("4444-1UserVmManagerImpl.java");
             cmd.setName(orgName + (countOfCloneVM > 1 ? Integer.toString(cnt) : ""));
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : listSnapshots) {
+                logger.info("4444-11UserVmManagerImpl.java vmSnapshotDetailsVO" + vmSnapshotDetailsVO.getValue());
                 SnapshotVO snapVO = _snapshotDao.findById(Long.parseLong(vmSnapshotDetailsVO.getValue()));
-                logger.info("4444-11UserVmManagerImpl.java");
+                logger.info("4444-11UserVmManagerImpl.java snapVO" + snapVO);
                 if (snapVO == null) {
                     logger.info("4444-2UserVmManagerImpl.java");
                     throw new CloudRuntimeException("Could not find snapshot for VM snapshot");
                 }
 
                 VolumeVO parentRootVolume = _volsDao.findByIdIncludingRemoved(snapVO.getVolumeId());
+                logger.info("4444-3UserVmManagerImpl.java parentRootVolume" + parentRootVolume);
                 long diskOfferingId = snapVO.getDiskOfferingId();
                 DiskOfferingVO diskOffering = _diskOfferingDao.findById(diskOfferingId);
                 Long minIops = snapVO.getMinIops();

From 1d6855e8d7a32e63138a0cf99b6e38adce8adefb Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 25 Feb 2026 16:41:50 +0900
Subject: [PATCH 07/93] Update UserVmManagerImpl.java

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 84fadbaaa9c9..cfe42ecc7686 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10702,6 +10702,9 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         logger.info("4444UserVmManagerImpl.java");
 
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
+        if (volume.getPoolType().equals(Storage.StoragePoolType.SharedMountPoint)) {
+            listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmFileBasedStorageSnapshot");
+        }
         logger.info("4444UserVmManagerImpl.java listSnapshots" + listSnapshots);
         Integer countOfCloneVM = cmd.getCount();
         logger.info("4444UserVmManagerImpl.java countOfCloneVM start" + countOfCloneVM);

From f8acd035bab38e1a4b3f26519e03dca59ca94ea3 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 26 Feb 2026 08:45:47 +0900
Subject: [PATCH 08/93] Update KVMStorageProcessor.java

---
 .../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index eff149d32f1f..3712191d04ae 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -2694,9 +2694,12 @@ public Answer createVolumeFromSnapshot(final CopyCommand cmd) {
             }
 
             final String snapshotFullPath = snapshot.getPath();
+            logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotFullPath"+ snapshotFullPath);
             final int index = snapshotFullPath.lastIndexOf("/");
             final String snapshotPath = snapshotFullPath.substring(0, index);
             final String snapshotName = snapshotFullPath.substring(index + 1);
+            logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotPath"+ snapshotPath);
+            logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotName"+ snapshotName);
             KVMPhysicalDisk disk = null;
             if (imageStore instanceof NfsTO) {
                 disk = createVolumeFromSnapshotOnNFS(cmd, pool, imageStore, volume, snapshotPath, snapshotName);

From fa9300b2106308c1c836021feb092b8cade3a501 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 26 Feb 2026 09:06:30 +0900
Subject: [PATCH 09/93] Update KVMStorageProcessor.java

---
 .../com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 3712191d04ae..a812134548c3 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -2684,6 +2684,7 @@ public Answer createVolumeFromSnapshot(final CopyCommand cmd) {
         final DataTO srcData = cmd.getSrcTO();
         final SnapshotObjectTO snapshot = (SnapshotObjectTO)srcData;
         final VolumeObjectTO volume = snapshot.getVolume();
+        logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotFullPath"+ snapshot.getPath());
         try {
             final DataTO destData = cmd.getDestTO();
             final PrimaryDataStoreTO pool = (PrimaryDataStoreTO)destData.getDataStore();

From 4143ebe6c64d7dcb32f7fe4fe9ff26b8c26f9d34 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 26 Feb 2026 09:47:49 +0900
Subject: [PATCH 10/93] test

---
 .../kvm/storage/KVMStorageProcessor.java       |  4 ----
 .../java/com/cloud/vm/UserVmManagerImpl.java   | 18 ------------------
 2 files changed, 22 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index a812134548c3..eff149d32f1f 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -2684,7 +2684,6 @@ public Answer createVolumeFromSnapshot(final CopyCommand cmd) {
         final DataTO srcData = cmd.getSrcTO();
         final SnapshotObjectTO snapshot = (SnapshotObjectTO)srcData;
         final VolumeObjectTO volume = snapshot.getVolume();
-        logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotFullPath"+ snapshot.getPath());
         try {
             final DataTO destData = cmd.getDestTO();
             final PrimaryDataStoreTO pool = (PrimaryDataStoreTO)destData.getDataStore();
@@ -2695,12 +2694,9 @@ public Answer createVolumeFromSnapshot(final CopyCommand cmd) {
             }
 
             final String snapshotFullPath = snapshot.getPath();
-            logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotFullPath"+ snapshotFullPath);
             final int index = snapshotFullPath.lastIndexOf("/");
             final String snapshotPath = snapshotFullPath.substring(0, index);
             final String snapshotName = snapshotFullPath.substring(index + 1);
-            logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotPath"+ snapshotPath);
-            logger.info("KVMStorageProcessor.java createVolumeFromSnapshot snapshotName"+ snapshotName);
             KVMPhysicalDisk disk = null;
             if (imageStore instanceof NfsTO) {
                 disk = createVolumeFromSnapshotOnNFS(cmd, pool, imageStore, volume, snapshotPath, snapshotName);
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index cfe42ecc7686..b63ec888aeee 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10681,47 +10681,34 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         VMSnapshot vmSnapshot = null;
         try {
             vmSnapshot = _vmSnapshotMgr.allocVMSnapshot(curVm.getId(), null, null, false);
-            logger.info("1111UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
             if (vmSnapshot == null) {
                 throw new CloudRuntimeException("Failed to create vm snapshot");
             }
             vmSnapshot = _vmSnapshotMgr.createVMSnapshot(curVm.getId(), vmSnapshot.getId(), false);
-            logger.info("2222UserVmManagerImpl.java vmSnapshot :" + vmSnapshot);
             if (vmSnapshot == null) {
                 throw new CloudRuntimeException("Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
             }
         } catch (CloudRuntimeException e) {
-            logger.info("UserVmManagerImpl.java CloudRuntimeException vmSnapshot :" + vmSnapshot);
-            logger.info("3333UserVmManagerImpl.java CloudRuntimeException vmSnapshot :" + vmSnapshot);
             if(vmSnapshot != null){
                 _vmSnapshotMgr.deleteVMSnapshot(vmSnapshot.getId());
             }
             throw new CloudRuntimeException("Failed to create vm snapshot: " + e.getMessage(), e);
         }
 
-        logger.info("4444UserVmManagerImpl.java");
-
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
         if (volume.getPoolType().equals(Storage.StoragePoolType.SharedMountPoint)) {
             listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmFileBasedStorageSnapshot");
         }
-        logger.info("4444UserVmManagerImpl.java listSnapshots" + listSnapshots);
         Integer countOfCloneVM = cmd.getCount();
-        logger.info("4444UserVmManagerImpl.java countOfCloneVM start" + countOfCloneVM);
         for (int cnt = 1; cnt <= countOfCloneVM; cnt++) {
-            logger.info("4444-1UserVmManagerImpl.java");
             cmd.setName(orgName + (countOfCloneVM > 1 ? Integer.toString(cnt) : ""));
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : listSnapshots) {
-                logger.info("4444-11UserVmManagerImpl.java vmSnapshotDetailsVO" + vmSnapshotDetailsVO.getValue());
                 SnapshotVO snapVO = _snapshotDao.findById(Long.parseLong(vmSnapshotDetailsVO.getValue()));
-                logger.info("4444-11UserVmManagerImpl.java snapVO" + snapVO);
                 if (snapVO == null) {
-                    logger.info("4444-2UserVmManagerImpl.java");
                     throw new CloudRuntimeException("Could not find snapshot for VM snapshot");
                 }
 
                 VolumeVO parentRootVolume = _volsDao.findByIdIncludingRemoved(snapVO.getVolumeId());
-                logger.info("4444-3UserVmManagerImpl.java parentRootVolume" + parentRootVolume);
                 long diskOfferingId = snapVO.getDiskOfferingId();
                 DiskOfferingVO diskOffering = _diskOfferingDao.findById(diskOfferingId);
                 Long minIops = snapVO.getMinIops();
@@ -10730,20 +10717,16 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                 Storage.ProvisioningType provisioningType = diskOffering.getProvisioningType();
                 String rootVolumeName = cmd.getName() + "-" + parentRootVolume.getName();
                 if (parentRootVolume.getVolumeType() == Volume.Type.ROOT) {
-                    logger.info("4444-3UserVmManagerImpl.java");
                     if (StringUtils.isNotBlank(clone_type)){
                         snapVO.setCloneType(clone_type);
                         _snapshotDao.update(snapVO.getId(), snapVO);
                     }
-                    logger.info("4444-4UserVmManagerImpl.java");
                     VolumeVO newVol = cloneVolumeFromSnapToDB(curVmAccount, true, zoneId, diskOfferingId, provisioningType, size, minIops, maxIops, parentRootVolume, rootVolumeName,
                                                                         _uuidMgr.generateUuid(Volume.class, null), new HashMap<>(), Volume.Type.ROOT, 0L);
-                    logger.info("4444-5UserVmManagerImpl.java");
                     VolumeVO rootVolume = (VolumeVO) _volumeService.cloneVolumeFromSnapshot(newVol, snapVO.getId(), curVm.getId());
                     if (rootVolume == null) {
                         throw new CloudRuntimeException("Creation of root volume is not queried. The virtual machine cannot be cloned!");
                     }
-                    logger.info("4444-6UserVmManagerImpl.java");
                     UserVm cloneVM = createCloneVM(cmd, rootVolume.getId());
                     if (cloneVM == null) {
                         throw new CloudRuntimeException("Unable to record the VM to DB!");
@@ -10757,7 +10740,6 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                     break;
                 }
             }
-            logger.info("5555UserVmManagerImpl.java");
 
 
             List<VolumeVO> createdVolumes = new ArrayList<>();

From 5241405581d61ad164c6cef1b37829f3e30d96ab Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 26 Feb 2026 09:48:16 +0900
Subject: [PATCH 11/93] Update CloneVM.vue

---
 ui/src/views/compute/CloneVM.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/views/compute/CloneVM.vue b/ui/src/views/compute/CloneVM.vue
index e1e6bc9303ac..679f411ea179 100644
--- a/ui/src/views/compute/CloneVM.vue
+++ b/ui/src/views/compute/CloneVM.vue
@@ -64,7 +64,7 @@
 </template>
 <script>
 import { ref, reactive, toRaw } from 'vue'
-import { postAPI } from '@/api'
+import { getAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 
 export default {
@@ -121,7 +121,7 @@ export default {
           params.clonetype = null
         }
         // console.log(params)
-        postAPI('cloneVirtualMachine', params).then(json => {
+        getAPI('cloneVirtualMachine', params).then(json => {
           const jobId = json.clonevirtualmachineresponse.jobid
           this.$pollJob({
             jobId,

From e162798accc6b1f21b48abaa00b4ea3f2a74dab0 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 26 Feb 2026 09:49:33 +0900
Subject: [PATCH 12/93] Update UserVmManagerImpl.java

---
 .../main/java/com/cloud/vm/UserVmManagerImpl.java   | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index b63ec888aeee..9d70083f5fbf 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -73,9 +73,11 @@
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.command.admin.vm.DeployVMVolumeCmdByAdmin;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseCmd.HTTPMethod;
+import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd;
 import org.apache.cloudstack.api.command.admin.vm.CreateVMFromBackupCmdByAdmin;
 import org.apache.cloudstack.api.command.admin.vm.DeployVMCmdByAdmin;
@@ -10682,23 +10684,20 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         try {
             vmSnapshot = _vmSnapshotMgr.allocVMSnapshot(curVm.getId(), null, null, false);
             if (vmSnapshot == null) {
-                throw new CloudRuntimeException("Failed to create vm snapshot");
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot");
             }
             vmSnapshot = _vmSnapshotMgr.createVMSnapshot(curVm.getId(), vmSnapshot.getId(), false);
             if (vmSnapshot == null) {
-                throw new CloudRuntimeException("Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
+                throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
             }
         } catch (CloudRuntimeException e) {
             if(vmSnapshot != null){
                 _vmSnapshotMgr.deleteVMSnapshot(vmSnapshot.getId());
             }
-            throw new CloudRuntimeException("Failed to create vm snapshot: " + e.getMessage(), e);
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot: " + e.getMessage(), e);
         }
 
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
-        if (volume.getPoolType().equals(Storage.StoragePoolType.SharedMountPoint)) {
-            listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmFileBasedStorageSnapshot");
-        }
         Integer countOfCloneVM = cmd.getCount();
         for (int cnt = 1; cnt <= countOfCloneVM; cnt++) {
             cmd.setName(orgName + (countOfCloneVM > 1 ? Integer.toString(cnt) : ""));
@@ -10741,7 +10740,6 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                 }
             }
 
-
             List<VolumeVO> createdVolumes = new ArrayList<>();
             for (VMSnapshotDetailsVO vmSnapshotDetailsVO : listSnapshots) {
                 SnapshotVO snapVO = _snapshotDao.findById(Long.parseLong(vmSnapshotDetailsVO.getValue()));
@@ -10814,7 +10812,6 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
                 }
             }
         }
-        logger.info("4444UserVmManagerImpl.java countOfCloneVM end" + countOfCloneVM);
         return null;
     }
 

From b7456ab1070b285c1d3c55cc12ebe61dbfab97ab Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 26 Feb 2026 09:50:08 +0900
Subject: [PATCH 13/93] Update UserVmManagerImpl.java

---
 server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 9d70083f5fbf..2e86b8fb7c26 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -10690,6 +10690,7 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
             if (vmSnapshot == null) {
                 throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create vm snapshot due to an internal error creating snapshot for vm " + curVm.getId());
             }
+
         } catch (CloudRuntimeException e) {
             if(vmSnapshot != null){
                 _vmSnapshotMgr.deleteVMSnapshot(vmSnapshot.getId());
@@ -10698,6 +10699,7 @@ public Optional<UserVm> cloneVirtualMachine(CloneVMCmd cmd) throws ResourceAlloc
         }
 
         List<VMSnapshotDetailsVO> listSnapshots = vmSnapshotDetailsDao.findDetails(vmSnapshot.getId(), "kvmStorageSnapshot");
+
         Integer countOfCloneVM = cmd.getCount();
         for (int cnt = 1; cnt <= countOfCloneVM; cnt++) {
             cmd.setName(orgName + (countOfCloneVM > 1 ? Integer.toString(cnt) : ""));

From e1d2e15ae18975aa6c3f92c1dfcec95996c4a8f7 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 1 Apr 2026 09:42:54 +0900
Subject: [PATCH 14/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=20=EC=8A=A4=EC=BC=80?=
 =?UTF-8?q?=EC=A4=84=20=EA=B5=AC=EC=84=B1=EC=8B=9C=20=EA=B0=80=EC=83=81?=
 =?UTF-8?q?=EB=A8=B8=EC=8B=A0=20=EC=84=A0=ED=83=9D=EC=97=90=20=EB=94=B0?=
 =?UTF-8?q?=EB=A5=B8=20=EC=84=A4=EC=A0=95=20=EC=B4=88=EA=B8=B0=ED=99=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/views/compute/BackupScheduleWizard.vue | 17 +++++-
 .../compute/backup/CreateBackupSchedule.vue   | 21 +++++--
 ui/src/views/compute/backup/FormSchedule.vue  | 61 +++++++++++++++++--
 3 files changed, 85 insertions(+), 14 deletions(-)

diff --git a/ui/src/views/compute/BackupScheduleWizard.vue b/ui/src/views/compute/BackupScheduleWizard.vue
index 82db1503d929..d737f592a7dc 100644
--- a/ui/src/views/compute/BackupScheduleWizard.vue
+++ b/ui/src/views/compute/BackupScheduleWizard.vue
@@ -17,9 +17,10 @@
 
 <template>
   <div class="backup-layout">
-    <a-tabs defaultActiveKey="1" :animated="false">
+    <a-tabs :key="`tabs-${resource?.id}-${innerRenderKey}`" defaultActiveKey="1" :animated="false">
       <a-tab-pane :tab="$t('label.schedule')" key="1">
         <FormSchedule
+          :key="`form-${resource?.id}-${innerRenderKey}`"
           :loading="loading"
           :resource="resource"
           :dataSource="dataSource"
@@ -28,6 +29,7 @@
       </a-tab-pane>
       <a-tab-pane :tab="$t('label.scheduled.backups')" key="2">
         <BackupSchedule
+          :key="`backup-${resource?.id}-${innerRenderKey}`"
           :loading="loading"
           :resource="resource"
           :dataSource="dataSource"
@@ -58,7 +60,8 @@ export default {
   data () {
     return {
       loading: false,
-      dataSource: []
+      dataSource: [],
+      innerRenderKey: 0
     }
   },
   provide () {
@@ -72,6 +75,16 @@ export default {
   created () {
     this.fetchData()
   },
+  watch: {
+    'resource.id': {
+      immediate: false,
+      handler () {
+        this.dataSource = []
+        this.innerRenderKey++
+        this.fetchData()
+      }
+    }
+  },
   methods: {
     fetchData () {
       const params = {}
diff --git a/ui/src/views/compute/backup/CreateBackupSchedule.vue b/ui/src/views/compute/backup/CreateBackupSchedule.vue
index 8025daac0b54..7f5cdf933591 100644
--- a/ui/src/views/compute/backup/CreateBackupSchedule.vue
+++ b/ui/src/views/compute/backup/CreateBackupSchedule.vue
@@ -42,6 +42,7 @@
     <div v-if="selectedVM && selectedVM.id">
       <BackupScheduleWizard
         ref="backupScheduleWizard"
+        :key="wizardRenderKey"
         :resource="selectedVM"
         @close-action="closeAction"
         @refresh="handleRefresh"
@@ -57,6 +58,7 @@
 
 <script>
 import { getAPI } from '@/api'
+import { nextTick } from 'vue'
 import BackupScheduleWizard from '@/views/compute/BackupScheduleWizard'
 
 export default {
@@ -69,7 +71,13 @@ export default {
       vms: [],
       vmsLoading: false,
       selectedVMId: null,
-      selectedVM: null
+      selectedVM: null,
+      wizardResetSeq: 0
+    }
+  },
+  computed: {
+    wizardRenderKey () {
+      return `${this.selectedVM?.id || 'none'}-${this.wizardResetSeq}`
     }
   },
   created () {
@@ -91,12 +99,13 @@ export default {
         this.vmsLoading = false
       }
     },
-    onVMChange (vmId) {
+    async onVMChange (vmId) {
       const vm = this.vms.find(v => v.id === vmId)
-      if (vm) {
-        this.selectedVM = vm
-        this.selectedVMId = vmId
-      }
+      this.selectedVM = null
+      this.selectedVMId = vmId
+      this.wizardResetSeq++
+      await nextTick()
+      this.selectedVM = vm ? { ...vm } : null
     },
     closeAction () {
       this.$emit('refresh')
diff --git a/ui/src/views/compute/backup/FormSchedule.vue b/ui/src/views/compute/backup/FormSchedule.vue
index 34e4260eded7..7ed01551795d 100644
--- a/ui/src/views/compute/backup/FormSchedule.vue
+++ b/ui/src/views/compute/backup/FormSchedule.vue
@@ -248,6 +248,12 @@ export default {
           this.handleChangeIntervalType()
         }
       }
+    },
+    'resource.id': {
+      immediate: true,
+      handler () {
+        this.reinitializeForm()
+      }
     }
   },
   inject: ['refreshSchedule', 'closeSchedule'],
@@ -260,15 +266,45 @@ export default {
     initForm () {
       this.formRef = ref()
       this.form = reactive({
-        intervaltype: 'hourly'
+        intervaltype: 'hourly',
+        intervaltype: 'hourly',
+        time: null,
+        timeSelect: null,
+        'day-of-week': null,
+        'day-of-month': null,
+        maxbackups: null,
+        timezone: null,
+        quiescevm: false
       })
-      this.rules = reactive({
+      this.rules = {
         time: [{ type: 'number', required: true, message: this.$t('message.error.required.input') }],
         timeSelect: [{ type: 'object', required: true, message: this.$t('message.error.time') }],
         'day-of-week': [{ type: 'number', required: true, message: `${this.$t('message.error.select')}` }],
         'day-of-month': [{ required: true, message: `${this.$t('message.error.select')}` }],
         timezone: [{ required: true, message: `${this.$t('message.error.select')}` }]
-      })
+      }
+    },
+    reinitializeForm () {
+      this.dayOfWeek = []
+      this.dayOfMonth = []
+      this.backupProvider = null
+
+      this.form = {
+        intervaltype: 'hourly',
+        time: null,
+        timeSelect: null,
+        'day-of-week': null,
+        'day-of-month': null,
+        maxbackups: null,
+        timezone: null,
+        quiescevm: false
+      }
+
+      if (this.formRef && this.formRef.value && this.formRef.value.clearValidate) {
+        this.formRef.value.clearValidate()
+      }
+
+      this.fetchBackupOffering()
     },
     fetchBackupOffering () {
       if ('backupoffering' in this.resource) {
@@ -398,9 +434,22 @@ export default {
       })
     },
     resetForm () {
-      this.formRef.value.resetFields()
-      this.form.intervaltype = 'hourly'
-      this.tags = []
+      this.form = {
+        intervaltype: 'hourly',
+        time: null,
+        timeSelect: null,
+        'day-of-week': null,
+        'day-of-month': null,
+        maxbackups: null,
+        timezone: null,
+        quiescevm: false
+      }
+      this.dayOfWeek = []
+      this.dayOfMonth = []
+
+      if (this.formRef && this.formRef.value && this.formRef.value.clearValidate) {
+        this.formRef.value.clearValidate()
+      }
     },
     closeAction () {
       this.closeSchedule()

From 046f65a5dbebea666617df1afbf86c4103ce3a18 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 1 Apr 2026 14:03:40 +0900
Subject: [PATCH 15/93] =?UTF-8?q?1=EC=B0=A8=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

증분백업 정리 및 멀티 백업 플러그인 사용을 위한 재정리
---
 .../cloudstack/backup/BackupManager.java      |  23 +-
 .../backup/CommvaultRestoreBackupCommand.java |  18 +
 .../backup/CommvaultTakeBackupCommand.java    |  54 +++
 .../backup/RestoreBackupCommand.java          |   9 +
 .../cloudstack/backup/TakeBackupCommand.java  |  54 +++
 .../backup/CommvaultBackupProvider.java       | 213 ++++++++-
 .../backup/commvault/CommvaultClient.java     |  19 +-
 .../cloudstack/backup/NASBackupProvider.java  | 257 ++++++++++-
 ...tCommvaultRestoreBackupCommandWrapper.java | 224 ++++++++--
 ...virtCommvaultTakeBackupCommandWrapper.java |  12 +
 .../LibvirtRestoreBackupCommandWrapper.java   | 198 +++++++--
 .../LibvirtTakeBackupCommandWrapper.java      |  12 +
 scripts/vm/hypervisor/kvm/cvtbackup.sh        | 413 ++++++++++++------
 scripts/vm/hypervisor/kvm/nasbackup.sh        | 410 +++++++++++++++--
 .../template/HypervisorTemplateAdapter.java   |  11 +
 .../cloudstack/backup/BackupManagerImpl.java  |   1 +
 16 files changed, 1612 insertions(+), 316 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
index 9b8c17a95f25..de930c96aa0a 100644
--- a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
@@ -32,7 +32,6 @@
 import org.apache.cloudstack.api.command.user.backup.ListBackupsCmd;
 import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.framework.config.ConfigKey;
-import org.apache.cloudstack.framework.config.ValidatedConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
 
 import com.cloud.exception.ResourceUnavailableException;
@@ -54,11 +53,10 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             "false",
             "Is backup and recovery framework enabled.", false, ConfigKey.Scope.Zone);
 
-    ConfigKey<String> BackupProviderPlugin = new ValidatedConfigKey<>("Advanced", String.class,
+    ConfigKey<String> BackupProviderPlugin = new ConfigKey<>("Advanced", String.class,
             "backup.framework.provider.plugin",
             "dummy",
-            "The backup and recovery provider plugin. Valid plugin values: dummy, veeam, networker and nas",
-            true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key(), value -> validateBackupProviderConfig((String)value));
+            "The backup and recovery provider plugin.", true, ConfigKey.Scope.Zone, BackupFrameworkEnabled.key());
 
     ConfigKey<Long> BackupSyncPollingInterval = new ConfigKey<>("Advanced", Long.class,
             "backup.framework.sync.interval",
@@ -70,6 +68,14 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             "false",
             "Enable volume attach/detach operations for VMs that are assigned to Backup Offerings.", true);
 
+    ConfigKey<Boolean> KvmIncrementalBackup = new ConfigKey<>("Advanced", Boolean.class,
+            "kvm.incremental.backup",
+            "false",
+            "Enable KVM incremental backups for supported backup providers.",
+            false,
+            ConfigKey.Scope.Zone,
+            null);
+
     ConfigKey<Long> DefaultMaxAccountBackups = new ConfigKey<Long>("Account Defaults", Long.class,
             "max.account.backups",
             "20",
@@ -253,13 +259,4 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
 
     void checkAndRemoveBackupOfferingBeforeExpunge(VirtualMachine vm);
 
-    static void validateBackupProviderConfig(String value) {
-        if (value != null && (value.contains(",") || value.trim().contains(" "))) {
-            throw new IllegalArgumentException("Multiple backup provider plugins are not supported. Please provide a single plugin value.");
-        }
-        List<String> validPlugins = List.of("dummy", "veeam", "networker", "nas");
-        if (value != null && !validPlugins.contains(value)) {
-            throw new IllegalArgumentException("Invalid backup provider plugin: " + value + ". Valid plugin values are: " + String.join(", ", validPlugins));
-        }
-    }
 }
diff --git a/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
index fbcff2070801..173383053958 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
@@ -30,6 +30,8 @@ public class CommvaultRestoreBackupCommand extends Command  {
     private String vmName;
     private String backupPath;
     private List<String> backupVolumesUUIDs;
+    private List<String> backupFiles;
+    private List<String> backupFileChains;
     private List<PrimaryDataStoreTO> restoreVolumePools;
     private List<String> restoreVolumePaths;
     private String diskType;
@@ -124,6 +126,22 @@ public void setBackupVolumesUUIDs(List<String> backupVolumesUUIDs) {
         this.backupVolumesUUIDs = backupVolumesUUIDs;
     }
 
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
+    public List<String> getBackupFileChains() {
+        return backupFileChains;
+    }
+
+    public void setBackupFileChains(List<String> backupFileChains) {
+        this.backupFileChains = backupFileChains;
+    }
+
     public Integer getTimeout() {
         return this.timeout == null ? 0 : this.timeout;
     }
diff --git a/core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java
index f24f41d98675..28b24db046be 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java
@@ -30,6 +30,12 @@ public class CommvaultTakeBackupCommand extends Command {
     private List<PrimaryDataStoreTO> volumePools;
     private List<String> volumePaths;
     private Boolean quiesce;
+    private String backupType;
+    private String checkpointName;
+    private String parentBackupPath;
+    private String parentCheckpointName;
+    private String parentCheckpointPath;
+    private List<String> backupFiles;
 
     public CommvaultTakeBackupCommand(String vmName, String backupPath) {
         super();
@@ -77,6 +83,54 @@ public void setQuiesce(Boolean quiesce) {
         this.quiesce = quiesce;
     }
 
+    public String getBackupType() {
+        return backupType;
+    }
+
+    public void setBackupType(String backupType) {
+        this.backupType = backupType;
+    }
+
+    public String getCheckpointName() {
+        return checkpointName;
+    }
+
+    public void setCheckpointName(String checkpointName) {
+        this.checkpointName = checkpointName;
+    }
+
+    public String getParentBackupPath() {
+        return parentBackupPath;
+    }
+
+    public void setParentBackupPath(String parentBackupPath) {
+        this.parentBackupPath = parentBackupPath;
+    }
+
+    public String getParentCheckpointName() {
+        return parentCheckpointName;
+    }
+
+    public void setParentCheckpointName(String parentCheckpointName) {
+        this.parentCheckpointName = parentCheckpointName;
+    }
+
+    public String getParentCheckpointPath() {
+        return parentCheckpointPath;
+    }
+
+    public void setParentCheckpointPath(String parentCheckpointPath) {
+        this.parentCheckpointPath = parentCheckpointPath;
+    }
+
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
     @Override
     public boolean executeInSequence() {
         return true;
diff --git a/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
index c1d08ba71d8c..85ddd3cd3118 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
@@ -36,6 +36,7 @@ public class RestoreBackupCommand extends Command  {
     private List<String> restoreVolumePaths;
     private List<String> volumePaths;
     private List<String> backupFiles;
+    private List<String> backupFileChains;
     private String diskType;
     private Boolean vmExists;
     private VirtualMachine.State vmState;
@@ -110,6 +111,14 @@ public void setBackupFiles(List<String> backupFiles) {
         this.backupFiles = backupFiles;
     }
 
+    public List<String> getBackupFileChains() {
+        return backupFileChains;
+    }
+
+    public void setBackupFileChains(List<String> backupFileChains) {
+        this.backupFileChains = backupFileChains;
+    }
+
     public Boolean isVmExists() {
         return vmExists;
     }
diff --git a/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
index 5402b6b24760..20c26ce959ec 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
@@ -28,10 +28,16 @@
 public class TakeBackupCommand extends Command {
     private String vmName;
     private String backupPath;
+    private String backupType;
+    private String checkpointName;
+    private String parentBackupPath;
+    private String parentCheckpointName;
+    private String parentCheckpointPath;
     private String backupRepoType;
     private String backupRepoAddress;
     private List<PrimaryDataStoreTO> volumePools;
     private List<String> volumePaths;
+    private List<String> backupFiles;
     private Boolean quiesce;
     @LogLevel(LogLevel.Log4jLevel.Off)
     private String mountOptions;
@@ -58,6 +64,46 @@ public void setBackupPath(String backupPath) {
         this.backupPath = backupPath;
     }
 
+    public String getBackupType() {
+        return backupType;
+    }
+
+    public void setBackupType(String backupType) {
+        this.backupType = backupType;
+    }
+
+    public String getCheckpointName() {
+        return checkpointName;
+    }
+
+    public void setCheckpointName(String checkpointName) {
+        this.checkpointName = checkpointName;
+    }
+
+    public String getParentBackupPath() {
+        return parentBackupPath;
+    }
+
+    public void setParentBackupPath(String parentBackupPath) {
+        this.parentBackupPath = parentBackupPath;
+    }
+
+    public String getParentCheckpointName() {
+        return parentCheckpointName;
+    }
+
+    public void setParentCheckpointName(String parentCheckpointName) {
+        this.parentCheckpointName = parentCheckpointName;
+    }
+
+    public String getParentCheckpointPath() {
+        return parentCheckpointPath;
+    }
+
+    public void setParentCheckpointPath(String parentCheckpointPath) {
+        this.parentCheckpointPath = parentCheckpointPath;
+    }
+
     public String getBackupRepoType() {
         return backupRepoType;
     }
@@ -98,6 +144,14 @@ public void setVolumePaths(List<String> volumePaths) {
         this.volumePaths = volumePaths;
     }
 
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
     public Boolean getQuiesce() {
         return quiesce;
     }
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index a5e0f1e00a7c..c5676a9fd500 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -94,10 +94,23 @@
 import javax.inject.Inject;
 
 import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
+import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
 
 public class CommvaultBackupProvider extends AdapterBase implements BackupProvider, Configurable {
 
     private static final Logger LOG = LogManager.getLogger(CommvaultBackupProvider.class);
+    private static final String BACKUP_TYPE_FULL = "FULL";
+    private static final String BACKUP_TYPE_INCREMENTAL = "INCREMENTAL";
+    private static final String BACKUP_ENGINE_QCOW2 = "QCOW2";
+    private static final String BACKUP_ENGINE_RBD_DIFF = "RBD_DIFF";
+    private static final String DETAIL_CHECKPOINT_NAME = "commvault.checkpoint.name";
+    private static final String DETAIL_CHECKPOINT_PATH = "commvault.checkpoint.path";
+    private static final String DETAIL_PARENT_BACKUP_UUID = "commvault.parent.backup.uuid";
+    private static final String DETAIL_PARENT_BACKUP_PATH = "commvault.parent.backup.path";
+    private static final String DETAIL_PARENT_CHECKPOINT_NAME = "commvault.parent.checkpoint.name";
+    private static final String DETAIL_PARENT_CHECKPOINT_PATH = "commvault.parent.checkpoint.path";
+    private static final String DETAIL_BACKUP_ENGINE = "commvault.backup.engine";
+    private static final String DETAIL_STAGE_HOST = "commvault.stage.host";
     private static final String RM_COMMAND = "rm -rf %s";
     private static final int BASE_MAJOR = 11;
     private static final int BASE_FR = 32;
@@ -294,17 +307,30 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         final Date creationDate = new Date();
         final String backupPath = String.format("%s/%s/%s", COMMVAULT_DIRECTORY, vm.getInstanceName(),
                 new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
-
-        BackupVO backupVO = createBackupObject(vm, backupPath);
+        List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+        vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
+        Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
+        validateVolumePoolTypes(volumePoolsAndPaths.first());
+        final Backup latestBackup = getLatestBackedUpBackup(vm);
+        final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup, vmHost);
+        final String requestedBackupType = incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL;
+        final String checkpointName = String.format("backup.%s", UUID.randomUUID());
+        final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
+        final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
+        final Map<String, String> backupDetails = getBackupDetails(vm, backupPath, checkpointName, backupEngine, latestBackup, incrementalBackup, vmHost.getName());
+
+        BackupVO backupVO = createBackupObject(vm, backupPath, requestedBackupType, backupDetails);
         CommvaultTakeBackupCommand command = new CommvaultTakeBackupCommand(vm.getInstanceName(), backupPath);
         command.setQuiesce(quiesceVM);
-
-        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
-            List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
-            vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
-            Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
-            command.setVolumePools(volumePoolsAndPaths.first());
-            command.setVolumePaths(volumePoolsAndPaths.second());
+        command.setVolumePools(volumePoolsAndPaths.first());
+        command.setVolumePaths(volumePoolsAndPaths.second());
+        command.setBackupType(requestedBackupType);
+        command.setCheckpointName(checkpointName);
+        command.setBackupFiles(backupFiles);
+        if (incrementalBackup) {
+            command.setParentBackupPath(getBackupDetail(latestBackup, DETAIL_PARENT_BACKUP_PATH, latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(','))));
+            command.setParentCheckpointName(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
+            command.setParentCheckpointPath(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
         }
 
         BackupAnswer answer;
@@ -356,7 +382,8 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
                         LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to get storage policy id commvault api");
                     } else {
                         // 백업 실행
-                        String jobId = client.createBackup(subclientId, storagePolicyId, displayName, commCellName, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, subclientGUID, subclientName, csGUID, backupsetName);
+                        String jobId = client.createBackup(subclientId, storagePolicyId, displayName, commCellName, clientId, companyId, companyName, instanceName, appName, applicationId,
+                                clientName, backupsetId, instanceId, subclientGUID, subclientName, csGUID, backupsetName, requestedBackupType);
                         if (jobId != null) {
                             String jobStatus = client.getJobStatus(jobId);
                             String externalId = backupPath + "," + jobId;
@@ -382,13 +409,11 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
                                     }
                                     backupVO.setSize(Long.parseLong(size));
                                     backupVO.setStatus(Backup.Status.BackedUp);
-                                    List<Volume> vols = new ArrayList<>(volumeDao.findByInstance(vm.getId()));
-                                    backupVO.setBackedUpVolumes(backupManager.createVolumeInfoFromVolumes(vols));
+                                    backupVO.setDetails(backupDetails);
+                                    backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
                                     if (backupDao.update(backupVO.getId(), backupVO)) {
-                                        executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, cmd);
                                         return new Pair<>(true, backupVO);
                                     } else {
-                                        executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, cmd);
                                         throw new CloudRuntimeException("Failed to update backup");
                                     }
                                 } else {
@@ -425,11 +450,38 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         }
     }
 
-    private BackupVO createBackupObject(VirtualMachine vm, String backupPath) {
+    private Backup getLatestBackedUpBackup(VirtualMachine vm) {
+        List<Backup> backups = backupDao.listByVmId(null, vm.getId());
+        return backups.stream()
+                .filter(Objects::nonNull)
+                .filter(b -> Backup.Status.BackedUp.equals(b.getStatus()))
+                .max(Comparator.comparing(Backup::getDate))
+                .orElse(null);
+    }
+
+    private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBackup, Host vmHost) {
+        if (latestBackup == null) {
+            return false;
+        }
+
+        Long clusterId = getClusterIdFromRootVolume(vm);
+        if (clusterId == null) {
+            return false;
+        }
+
+        if (!Boolean.TRUE.equals(KvmIncrementalBackup.valueIn(clusterId))) {
+            return false;
+        }
+
+        String stageHost = getBackupDetail(latestBackup, DETAIL_STAGE_HOST);
+        return Objects.equals(stageHost, vmHost.getName());
+    }
+
+    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, Map<String, String> details) {
         BackupVO backup = new BackupVO();
         backup.setVmId(vm.getId());
         backup.setExternalId(backupPath);
-        backup.setType("FULL");
+        backup.setType(backupType);
         backup.setDate(new Date());
         long virtualSize = 0L;
         for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
@@ -444,12 +496,121 @@ private BackupVO createBackupObject(VirtualMachine vm, String backupPath) {
         backup.setDomainId(vm.getDomainId());
         backup.setZoneId(vm.getDataCenterId());
         backup.setName(backupManager.getBackupNameFromVM(vm));
-        Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
         backup.setDetails(details);
 
         return backupDao.persist(backup);
     }
 
+    private Map<String, String> getBackupDetails(VirtualMachine vm, String backupPath, String checkpointName, String backupEngine, Backup latestBackup,
+                                                 boolean incrementalBackup, String stageHost) {
+        Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
+        details.put(DETAIL_BACKUP_ENGINE, backupEngine);
+        details.put(DETAIL_STAGE_HOST, stageHost);
+        if (!incrementalBackup) {
+            return details;
+        }
+
+        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
+        details.put(DETAIL_CHECKPOINT_PATH, String.format("%s/checkpoints/%s.xml", backupPath, checkpointName));
+        details.put(DETAIL_PARENT_BACKUP_UUID, latestBackup.getUuid());
+        details.put(DETAIL_PARENT_BACKUP_PATH, latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(',')));
+        details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
+        details.put(DETAIL_PARENT_CHECKPOINT_PATH, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
+        return details;
+    }
+
+    private String getBackupDetail(Backup backup, String key) {
+        return backup == null ? null : backup.getDetail(key);
+    }
+
+    private String getBackupDetail(Backup backup, String key, String defaultValue) {
+        String value = getBackupDetail(backup, key);
+        return value == null ? defaultValue : value;
+    }
+
+    private void validateVolumePoolTypes(List<PrimaryDataStoreTO> volumePools) {
+        boolean hasRbd = volumePools.stream().anyMatch(pool -> pool.getPoolType() == Storage.StoragePoolType.RBD);
+        boolean hasNonRbd = volumePools.stream().anyMatch(pool -> pool.getPoolType() != Storage.StoragePoolType.RBD);
+        if (hasRbd && hasNonRbd) {
+            throw new CloudRuntimeException("Commvault incremental backup does not support VMs with mixed RBD and non-RBD volumes");
+        }
+    }
+
+    private boolean areAllVolumesOnRbdPool(List<PrimaryDataStoreTO> volumePools) {
+        return volumePools.stream().allMatch(pool -> pool.getPoolType() == Storage.StoragePoolType.RBD);
+    }
+
+    private List<String> buildBackupFileNames(List<VolumeVO> volumes, String backupEngine, boolean incrementalBackup) {
+        List<String> backupFiles = new ArrayList<>();
+        for (VolumeVO volume : volumes) {
+            String suffix;
+            if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+                suffix = incrementalBackup ? ".rbdiff" : ".raw";
+            } else {
+                suffix = ".qcow2";
+            }
+            backupFiles.add(String.format("volume-%s%s", volume.getUuid(), suffix));
+        }
+        return backupFiles;
+    }
+
+    private String createVolumeInfoFromVolumes(List<VolumeVO> volumes, List<String> backupFiles) {
+        List<Backup.VolumeInfo> infoList = new ArrayList<>();
+        for (int i = 0; i < volumes.size(); i++) {
+            VolumeVO vol = volumes.get(i);
+            DiskOffering diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
+            String diskOfferingUuid = diskOffering != null ? diskOffering.getUuid() : null;
+            infoList.add(new Backup.VolumeInfo(vol.getUuid(), backupFiles.get(i), vol.getVolumeType(), vol.getSize(),
+                    vol.getDeviceId(), diskOfferingUuid, vol.getMinIops(), vol.getMaxIops()));
+        }
+        return new com.google.gson.Gson().toJson(infoList.toArray(), Backup.VolumeInfo[].class);
+    }
+
+    private List<String> getBackupFileChains(List<Backup.VolumeInfo> backupVolumes, Backup backup) {
+        return backupVolumes.stream()
+                .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
+                .map(volume -> getBackupFileChain(volume, backup))
+                .collect(Collectors.toList());
+    }
+
+    private String getBackupFileChain(Backup.VolumeInfo backupVolume, Backup backup) {
+        List<String> chain = getBackupChain(backupVolume, backup);
+        return String.join(";", chain);
+    }
+
+    private List<String> getBackupChain(Backup.VolumeInfo backupVolume, Backup backup) {
+        List<String> chain = new ArrayList<>();
+        Backup current = backup;
+        while (current != null) {
+            Backup.VolumeInfo currentVolumeInfo = current.getBackedUpVolumes().stream()
+                    .filter(volume -> Objects.equals(volume.getUuid(), backupVolume.getUuid()))
+                    .findFirst()
+                    .orElse(null);
+            if (currentVolumeInfo == null) {
+                break;
+            }
+            chain.add(0, currentVolumeInfo.getPath());
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            if (parentBackupUuid == null) {
+                break;
+            }
+            current = backupDao.findByUuid(parentBackupUuid);
+        }
+        if (chain.isEmpty()) {
+            chain.add(backupVolume.getPath());
+        }
+        return chain;
+    }
+
+    private boolean isLegacyBackup(Backup backup) {
+        return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
+    }
+
+    private String getLegacyBackupFileName(Backup.VolumeInfo backupVolumeInfo) {
+        String diskType = Volume.Type.ROOT.equals(backupVolumeInfo.getType()) ? "root" : "datadisk";
+        return String.format("%s.%s.qcow2", diskType, backupVolumeInfo.getUuid());
+    }
+
     // 백업에서 새 인스턴스 생성
     @Override
     public Pair<Boolean, String> restoreBackupToVM(VirtualMachine vm, Backup backup, String hostIp, String dataStoreUuid) {
@@ -522,6 +683,18 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                 restoreCommand.setBackupPath(path);
                 restoreCommand.setVmName(vm.getName());
                 restoreCommand.setBackupVolumesUUIDs(backedVolumesUUIDs);
+                if (isLegacyBackup(backup)) {
+                    restoreCommand.setBackupFiles(backup.getBackedUpVolumes().stream()
+                            .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
+                            .map(this::getLegacyBackupFileName)
+                            .collect(Collectors.toList()));
+                } else {
+                    restoreCommand.setBackupFiles(backup.getBackedUpVolumes().stream()
+                            .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
+                            .map(Backup.VolumeInfo::getPath)
+                            .collect(Collectors.toList()));
+                    restoreCommand.setBackupFileChains(getBackupFileChains(backup.getBackedUpVolumes(), backup));
+                }
                 Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(restoreVolumes);
                 restoreCommand.setRestoreVolumePools(volumePoolsAndPaths.first());
                 restoreCommand.setRestoreVolumePaths(volumePoolsAndPaths.second());
@@ -679,6 +852,10 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 CommvaultRestoreBackupCommand restoreCommand = new CommvaultRestoreBackupCommand();
                 restoreCommand.setBackupPath(path);
                 restoreCommand.setVmName(vmNameAndState.first());
+                restoreCommand.setBackupFiles(Collections.singletonList(isLegacyBackup(backup) ? getLegacyBackupFileName(backupVolumeInfo) : backupVolumeInfo.getPath()));
+                if (!isLegacyBackup(backup)) {
+                    restoreCommand.setBackupFileChains(Collections.singletonList(getBackupFileChain(backupVolumeInfo, backup)));
+                }
                 restoreCommand.setRestoreVolumePaths(Collections.singletonList(String.format("%s/%s", getVolumePathPrefix(pool), volumeUUID)));
                 DataStore dataStore = dataStoreMgr.getDataStore(pool.getId(), DataStoreRole.Primary);
                 restoreCommand.setRestoreVolumePools(Collections.singletonList(dataStore != null ? (PrimaryDataStoreTO)dataStore.getTO() : null));
@@ -1171,4 +1348,4 @@ public static boolean versionCheck(String csVersionInfo) {
         return true;
     }
 
-}
\ No newline at end of file
+}
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
index 9623b2e34049..cafe984a12fa 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
@@ -964,8 +964,14 @@ public boolean updateBackupSet(String path, String subclientId, String clientId,
     // POST https://<commserveIp>/commandcenter/api/subclient/<subclientId>/action/backup 테스트 시 Incremental 백업으로 반환되어 사용 x
     // POST https://<commserveIp>/commandcenter/api/createtask
     // 백업 실행 API
-    public String createBackup(String subclientId, String storagePolicyId, String displayName, String commCellName, String clientId, String companyId, String companyName, String instanceName, String appName, String applicationId, String clientName, String backupsetId, String instanceId, String subclientGUID, String subclientName, String csGUID, String backupsetName) {
+    public String createBackup(String subclientId, String storagePolicyId, String displayName, String commCellName, String clientId, String companyId, String companyName, String instanceName,
+            String appName, String applicationId, String clientName, String backupsetId, String instanceId, String subclientGUID, String subclientName, String csGUID,
+            String backupsetName, String backupType) {
         HttpURLConnection connection = null;
+        final boolean incrementalBackup = "INCREMENTAL".equalsIgnoreCase(backupType);
+        final String backupLevel = incrementalBackup ? "INCREMENTAL" : "FULL";
+        final String runIncrementalBackup = incrementalBackup ? "true" : "false";
+        final String forceFullBackup = incrementalBackup ? "false" : "true";
         String postUrl = apiURI.toString() + "/createtask";
         try {
             URL url = new URL(postUrl);
@@ -1012,9 +1018,9 @@ public String createBackup(String subclientId, String storagePolicyId, String di
                             "}," +
                             "\"options\":{" +
                                 "\"backupOpts\":{" +
-                                    "\"backupLevel\":\"FULL\"," +
-                                    "\"runIncrementalBackup\":false," +
-                                    "\"forceFullBackup\":true" +
+                                    "\"backupLevel\":\"%s\"," +
+                                    "\"runIncrementalBackup\":%s," +
+                                    "\"forceFullBackup\":%s" +
                                 "}," +
                                 "\"commonOpts\":{" +
                                     "\"overrideStoragePolicySettings\":true," +
@@ -1027,7 +1033,8 @@ public String createBackup(String subclientId, String storagePolicyId, String di
                 Integer.parseInt(subclientId), Integer.parseInt(storagePolicyId), displayName, commCellName,
                 Integer.parseInt(clientId), Integer.parseInt(companyId), companyName, instanceName, appName,
                 Integer.parseInt(applicationId), clientName, Integer.parseInt(backupsetId),
-                Integer.parseInt(instanceId), subclientGUID, subclientName, csGUID, backupsetName
+                Integer.parseInt(instanceId), subclientGUID, subclientName, csGUID, backupsetName,
+                backupLevel, runIncrementalBackup, forceFullBackup
             );
             try (OutputStream os = connection.getOutputStream()) {
                 byte[] input = jsonBody.getBytes(StandardCharsets.UTF_8);
@@ -1727,4 +1734,4 @@ private String convertPathToJsonArray(String path) {
         jsonArray.append("]");
         return jsonArray.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 4e1455aa4b9d..7a1d6e10620e 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -65,6 +65,7 @@
 import javax.inject.Inject;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -76,9 +77,21 @@
 import java.util.stream.Collectors;
 
 import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
+import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
 
 public class NASBackupProvider extends AdapterBase implements BackupProvider, Configurable {
     private static final Logger LOG = LogManager.getLogger(NASBackupProvider.class);
+    private static final String BACKUP_TYPE_FULL = "FULL";
+    private static final String BACKUP_TYPE_INCREMENTAL = "INCREMENTAL";
+    private static final String BACKUP_ENGINE_QCOW2 = "QCOW2";
+    private static final String BACKUP_ENGINE_RBD_DIFF = "RBD_DIFF";
+    private static final String DETAIL_CHECKPOINT_NAME = "nas.checkpoint.name";
+    private static final String DETAIL_CHECKPOINT_PATH = "nas.checkpoint.path";
+    private static final String DETAIL_PARENT_BACKUP_UUID = "nas.parent.backup.uuid";
+    private static final String DETAIL_PARENT_BACKUP_PATH = "nas.parent.backup.path";
+    private static final String DETAIL_PARENT_CHECKPOINT_NAME = "nas.parent.checkpoint.name";
+    private static final String DETAIL_PARENT_CHECKPOINT_PATH = "nas.parent.checkpoint.path";
+    private static final String DETAIL_BACKUP_ENGINE = "nas.backup.engine";
 
     ConfigKey<Integer> NASBackupRestoreMountTimeout = new ConfigKey<>("Advanced", Integer.class,
             "nas.backup.restore.mount.timeout",
@@ -206,22 +219,34 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
         final Date creationDate = new Date();
         final String backupPath = String.format("%s/%s", vm.getInstanceName(),
                 new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
-
-        BackupVO backupVO = createBackupObject(vm, backupPath);
+        final String checkpointName = backupPath.substring(backupPath.lastIndexOf("/") + 1);
+        List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+        vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
+        Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
+        validateVolumePoolTypes(volumePoolsAndPaths.first());
+        final BackupVO latestBackup = getLatestBackedUpBackup(vm);
+        final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup);
+        final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
+        final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
+
+        BackupVO backupVO = createBackupObject(vm, backupPath, incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL,
+                checkpointName, backupEngine, incrementalBackup ? latestBackup : null);
         TakeBackupCommand command = new TakeBackupCommand(vm.getInstanceName(), backupPath);
+        command.setBackupType(backupVO.getType());
+        command.setCheckpointName(checkpointName);
+        command.setBackupFiles(backupFiles);
+        command.setVolumePools(volumePoolsAndPaths.first());
+        command.setVolumePaths(volumePoolsAndPaths.second());
+        if (incrementalBackup) {
+            command.setParentBackupPath(latestBackup.getExternalId());
+            command.setParentCheckpointName(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
+            command.setParentCheckpointPath(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
+        }
         command.setBackupRepoType(backupRepository.getType());
         command.setBackupRepoAddress(backupRepository.getAddress());
         command.setMountOptions(backupRepository.getMountOptions());
         command.setQuiesce(quiesceVM);
 
-        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
-            List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
-            vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
-            Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
-            command.setVolumePools(volumePoolsAndPaths.first());
-            command.setVolumePaths(volumePoolsAndPaths.second());
-        }
-
         BackupAnswer answer;
         try {
             answer = (BackupAnswer) agentManager.send(host.getId(), command);
@@ -241,8 +266,7 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
             backupVO.setDate(new Date());
             backupVO.setSize(answer.getSize());
             backupVO.setStatus(Backup.Status.BackedUp);
-            List<Volume> volumes = new ArrayList<>(volumeDao.findByInstance(vm.getId()));
-            backupVO.setBackedUpVolumes(backupManager.createVolumeInfoFromVolumes(volumes));
+            backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
             if (backupDao.update(backupVO.getId(), backupVO)) {
                 return new Pair<>(true, backupVO);
             } else {
@@ -250,7 +274,7 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
             }
         } else {
             logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
-            if (answer.getNeedsCleanup()) {
+            if (answer != null && answer.getNeedsCleanup()) {
                 logger.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
                 backupVO.setStatus(Backup.Status.Error);
                 backupDao.update(backupVO.getId(), backupVO);
@@ -262,11 +286,11 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
         }
     }
 
-    private BackupVO createBackupObject(VirtualMachine vm, String backupPath) {
+    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, String checkpointName, String backupEngine, Backup parentBackup) {
         BackupVO backup = new BackupVO();
         backup.setVmId(vm.getId());
         backup.setExternalId(backupPath);
-        backup.setType("FULL");
+        backup.setType(backupType);
         backup.setDate(new Date());
         long virtualSize = 0L;
         for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
@@ -281,12 +305,105 @@ private BackupVO createBackupObject(VirtualMachine vm, String backupPath) {
         backup.setDomainId(vm.getDomainId());
         backup.setZoneId(vm.getDataCenterId());
         backup.setName(backupManager.getBackupNameFromVM(vm));
-        Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
+        Map<String, String> details = new HashMap<>();
+        Map<String, String> backupDetails = backupManager.getBackupDetailsFromVM(vm);
+        if (backupDetails != null) {
+            details.putAll(backupDetails);
+        }
+        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
+        details.put(DETAIL_CHECKPOINT_PATH, String.format("%s/checkpoints/%s.xml", backupPath, checkpointName));
+        details.put(DETAIL_BACKUP_ENGINE, backupEngine);
+        if (parentBackup != null) {
+            details.put(DETAIL_PARENT_BACKUP_UUID, parentBackup.getUuid());
+            details.put(DETAIL_PARENT_BACKUP_PATH, parentBackup.getExternalId());
+            details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(parentBackup, DETAIL_CHECKPOINT_NAME));
+            details.put(DETAIL_PARENT_CHECKPOINT_PATH, getBackupDetail(parentBackup, DETAIL_CHECKPOINT_PATH));
+        }
         backup.setDetails(details);
 
         return backupDao.persist(backup);
     }
 
+    private BackupVO getLatestBackedUpBackup(VirtualMachine vm) {
+        List<Backup> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId());
+        return backups.stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
+                .peek(backupDao::loadDetails)
+                .filter(backup -> getBackupDetail(backup, DETAIL_CHECKPOINT_NAME) != null)
+                .max(Comparator.comparing(BackupVO::getDate))
+                .orElse(null);
+    }
+
+    private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBackup) {
+        if (latestBackup == null) {
+            return false;
+        }
+
+        final Long clusterId = getClusterIdFromRootVolume(vm);
+        if (clusterId == null) {
+            LOG.debug("Unable to resolve cluster for VM [{}], fallback to full backup.", vm);
+            return false;
+        }
+
+        return KvmIncrementalBackup.valueIn(clusterId);
+    }
+
+    private boolean hasDependentBackups(Backup backup) {
+        List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
+        return backups.stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(candidate -> !Objects.equals(candidate.getId(), backup.getId()))
+                .peek(backupDao::loadDetails)
+                .anyMatch(candidate -> Objects.equals(getBackupDetail(candidate, DETAIL_PARENT_BACKUP_UUID), backup.getUuid()));
+    }
+
+    private String getBackupDetail(Backup backup, String key) {
+        Map<String, String> details = backup.getDetails();
+        return details != null ? details.get(key) : null;
+    }
+
+    private void validateVolumePoolTypes(List<PrimaryDataStoreTO> volumePools) {
+        boolean hasRbd = volumePools.stream().anyMatch(pool -> pool != null && Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
+        boolean hasNonRbd = volumePools.stream().anyMatch(pool -> pool != null && !Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
+        if (hasRbd && hasNonRbd) {
+            throw new CloudRuntimeException("NAS incremental backup does not support VMs with mixed RBD and non-RBD volumes");
+        }
+    }
+
+    private boolean areAllVolumesOnRbdPool(List<PrimaryDataStoreTO> volumePools) {
+        return CollectionUtils.isNotEmpty(volumePools) &&
+                volumePools.stream().allMatch(pool -> pool != null && Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
+    }
+
+    private List<String> buildBackupFileNames(List<VolumeVO> volumes, String backupEngine, boolean incrementalBackup) {
+        List<String> backupFiles = new ArrayList<>();
+        for (VolumeVO volume : volumes) {
+            String suffix;
+            if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+                suffix = incrementalBackup ? ".rbdiff" : ".raw";
+            } else {
+                suffix = ".qcow2";
+            }
+            backupFiles.add(String.format("volume-%s%s", volume.getUuid(), suffix));
+        }
+        return backupFiles;
+    }
+
+    private String createVolumeInfoFromVolumes(List<VolumeVO> volumes, List<String> backupFiles) {
+        List<Backup.VolumeInfo> infoList = new ArrayList<>();
+        for (int i = 0; i < volumes.size(); i++) {
+            VolumeVO vol = volumes.get(i);
+            DiskOffering diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
+            String diskOfferingUuid = diskOffering != null ? diskOffering.getUuid() : null;
+            infoList.add(new Backup.VolumeInfo(vol.getUuid(), backupFiles.get(i), vol.getVolumeType(), vol.getSize(),
+                    vol.getDeviceId(), diskOfferingUuid, vol.getMinIops(), vol.getMaxIops()));
+        }
+        return new com.google.gson.Gson().toJson(infoList.toArray(), Backup.VolumeInfo[].class);
+    }
+
     @Override
     public Pair<Boolean, String> restoreBackupToVM(VirtualMachine vm, Backup backup, String hostIp, String dataStoreUuid) {
         return restoreVMBackup(vm, backup);
@@ -298,7 +415,8 @@ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
     }
 
     private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup) {
-        List<String> backedVolumesUUIDs = backup.getBackedUpVolumes().stream()
+        List<Backup.VolumeInfo> backupVolumes = backup.getBackedUpVolumes();
+        List<String> backedVolumesUUIDs = backupVolumes.stream()
                 .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
                 .map(Backup.VolumeInfo::getUuid)
                 .collect(Collectors.toList());
@@ -322,7 +440,8 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         restoreCommand.setRestoreVolumePools(volumePoolsAndPaths.first());
         restoreCommand.setRestoreVolumePaths(volumePoolsAndPaths.second());
         restoreCommand.setVolumePaths(getVolumePaths(restoreVolumes));
-        restoreCommand.setBackupFiles(getBackupFiles(vm.getBackupVolumeList()));
+        restoreCommand.setBackupFiles(getBackupFiles(backupVolumes, backup));
+        restoreCommand.setBackupFileChains(getBackupFileChains(backupVolumes, backup));
         restoreCommand.setVmExists(vm.getRemoved() == null);
         restoreCommand.setVmState(vm.getState());
         restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
@@ -338,14 +457,101 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         return new Pair<>(answer.getResult(), answer.getDetails());
     }
 
-    private List<String> getBackupFiles(List<Backup.VolumeInfo> backedVolumes) {
+    private List<String> getBackupFiles(List<Backup.VolumeInfo> backedVolumes, Backup backup) {
         List<String> backupFiles = new ArrayList<>();
-        for (Backup.VolumeInfo backedVolume : backedVolumes) {
-            backupFiles.add(backedVolume.getPath());
+        List<Backup.VolumeInfo> sortedVolumes = new ArrayList<>(backedVolumes);
+        sortedVolumes.sort(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId));
+        for (Backup.VolumeInfo backedVolume : sortedVolumes) {
+            if (isLegacyBackup(backup)) {
+                backupFiles.add(getLegacyBackupFileName(backedVolume));
+            } else {
+                backupFiles.add(backedVolume.getPath());
+            }
         }
         return backupFiles;
     }
 
+    private List<String> getBackupFileChains(List<Backup.VolumeInfo> backedVolumes, Backup backup) {
+        List<String> backupFileChains = new ArrayList<>();
+        List<Backup.VolumeInfo> sortedVolumes = new ArrayList<>(backedVolumes);
+        sortedVolumes.sort(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId));
+        for (Backup.VolumeInfo backedVolume : sortedVolumes) {
+            backupFileChains.add(String.join(";", getBackupFileChain(backedVolume.getUuid(), backup)));
+        }
+        return backupFileChains;
+    }
+
+    private List<String> getBackupFileChain(String volumeUuid, Backup backup) {
+        if (isLegacyBackup(backup)) {
+            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
+            return volumeInfo != null ? getLegacyBackupFileCandidates(volumeInfo) : List.of();
+        }
+
+        String backupEngine = getBackupDetail(backup, DETAIL_BACKUP_ENGINE);
+        if (!BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
+            return volumeInfo != null ? List.of(volumeInfo.getPath()) : List.of();
+        }
+
+        List<Backup> chain = getBackupChain(backup);
+        List<String> files = new ArrayList<>();
+        for (Backup chainBackup : chain) {
+            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(chainBackup.getBackedUpVolumes(), volumeUuid);
+            if (volumeInfo != null) {
+                files.add(String.format("%s/%s", chainBackup.getExternalId(), volumeInfo.getPath()));
+            }
+        }
+        return files;
+    }
+
+    private List<Backup> getBackupChain(Backup backup) {
+        List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
+        Map<String, Backup> backupsByUuid = new HashMap<>();
+        for (Backup candidate : backups) {
+            if (candidate instanceof BackupVO) {
+                backupDao.loadDetails((BackupVO) candidate);
+            }
+            backupsByUuid.put(candidate.getUuid(), candidate);
+        }
+
+        List<Backup> chain = new ArrayList<>();
+        Backup current = backup;
+        while (current != null) {
+            chain.add(current);
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            current = parentBackupUuid != null ? backupsByUuid.get(parentBackupUuid) : null;
+        }
+        Collections.reverse(chain);
+        return chain;
+    }
+
+    private boolean isLegacyBackup(Backup backup) {
+        return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
+    }
+
+    private String getLegacyBackupFileName(Backup.VolumeInfo volumeInfo) {
+        String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
+        return String.format("%s.%s.qcow2", diskPrefix, volumeInfo.getPath());
+    }
+
+    private List<String> getLegacyBackupFileCandidates(Backup.VolumeInfo volumeInfo) {
+        List<String> candidates = new ArrayList<>();
+        String legacyFileName = getLegacyBackupFileName(volumeInfo);
+        candidates.add(legacyFileName);
+
+        String volumePath = volumeInfo.getPath();
+        if (volumePath != null && volumePath.contains("/")) {
+            String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
+            String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
+            String baseNameLegacyFile = String.format("%s.%s.qcow2", diskPrefix, baseName);
+            if (!Objects.equals(legacyFileName, baseNameLegacyFile)) {
+                candidates.add(baseNameLegacyFile);
+            }
+        }
+
+        return candidates;
+    }
+
     private List<String> getVolumePaths(List<VolumeVO> volumes) {
         List<String> volumePaths = new ArrayList<>();
         for (VolumeVO volume : volumes) {
@@ -461,7 +667,8 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
         restoreCommand.setCacheMode(cacheMode);
         restoreCommand.setVolumePaths(Collections.singletonList(String.format("%s/%s", pool.getPath(), volumeUUID)));
-        restoreCommand.setBackupFiles(Collections.singletonList(matchingVolume.getPath()));
+        restoreCommand.setBackupFiles(getBackupFiles(Collections.singletonList(matchingVolume), backup));
+        restoreCommand.setBackupFileChains(Collections.singletonList(String.join(";", getBackupFileChain(matchingVolume.getUuid(), backup))));
 
         BackupAnswer answer;
         try {
@@ -500,6 +707,10 @@ private Backup.VolumeInfo getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUp
 
     @Override
     public boolean deleteBackup(Backup backup, boolean forced) {
+        if (!forced && hasDependentBackups(backup)) {
+            throw new CloudRuntimeException(String.format("Backup [%s] cannot be deleted because one or more incremental backups depend on it.", backup.getUuid()));
+        }
+
         final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backup.getBackupOfferingId());
         if (backupRepository == null) {
             throw new CloudRuntimeException("No valid backup repository found for the VM, please check the attached backup offering");
@@ -526,7 +737,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
         }
 
         if (answer != null && answer.getResult()) {
-            return backupDao.remove(backup.getId());
+            return true;
         }
 
         logger.debug("There was an error removing the backup with id {}", backup.getId());
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index 5ffce02fd138..29d2d03c0bdc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -43,6 +43,9 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -64,6 +67,8 @@ public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingRes
         Boolean vmExists = command.isVmExists();
         String diskType = command.getDiskType();
         List<String> backedVolumeUUIDs = command.getBackupVolumesUUIDs();
+        List<String> backupFiles = command.getBackupFiles();
+        List<String> backupFileChains = command.getBackupFileChains();
         List<PrimaryDataStoreTO> restoreVolumePools = command.getRestoreVolumePools();
         List<String> restoreVolumePaths = command.getRestoreVolumePaths();
         String restoreVolumeUuid = command.getRestoreVolumeUUID();
@@ -82,12 +87,12 @@ public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingRes
                 String volumePath = restoreVolumePaths.get(0);
                 int lastIndex = volumePath.lastIndexOf("/");
                 newVolumeId = volumePath.substring(lastIndex + 1);
-                restoreVolume(storagePoolMgr, backupPath, volumePool, volumePath, diskType, restoreVolumeUuid,
+                restoreVolume(storagePoolMgr, backupPath, volumePool, volumePath, diskType, restoreVolumeUuid, backupFiles, backupFileChains,
                         new Pair<>(vmName, command.getVmState()), timeout, cacheMode);
             } else if (Boolean.TRUE.equals(vmExists)) {
-                restoreVolumesOfExistingVM(storagePoolMgr, restoreVolumePools, restoreVolumePaths, backedVolumeUUIDs, backupPath, timeout);
+                restoreVolumesOfExistingVM(storagePoolMgr, restoreVolumePools, restoreVolumePaths, backedVolumeUUIDs, backupPath, backupFiles, backupFileChains, timeout);
             } else {
-                restoreVolumesOfDestroyedVMs(storagePoolMgr, restoreVolumePools, restoreVolumePaths, vmName, backupPath, timeout);
+                restoreVolumesOfDestroyedVMs(storagePoolMgr, restoreVolumePools, restoreVolumePaths, vmName, backupPath, backupFiles, backupFileChains, timeout);
             }
         } catch (CloudRuntimeException e) {
             String errorMessage = e.getMessage() != null ? e.getMessage() : "";
@@ -97,28 +102,18 @@ public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingRes
         return new BackupAnswer(command, true, newVolumeId);
     }
 
-    private void verifyBackupFile(String backupPath, String volUuid) {
-        if (!checkBackupPathExists(backupPath)) {
-            throw new CloudRuntimeException(String.format("Backup file for the volume [%s] does not exist.", volUuid));
-        }
-        if (!checkBackupFileImage(backupPath)) {
-            throw new CloudRuntimeException(String.format("Backup qcow2 file for the volume [%s] is corrupt.", volUuid));
-        }
-    }
-
     private void restoreVolumesOfExistingVM(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> restoreVolumePools, List<String> restoreVolumePaths, List<String> backedVolumesUUIDs,
-                                            String backupPath, int timeout) {
+                                            String backupPath, List<String> backupFiles, List<String> backupFileChains, int timeout) {
         String diskType = "root";
         try {
             for (int idx = 0; idx < restoreVolumePaths.size(); idx++) {
                 PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
                 String restoreVolumePath = restoreVolumePaths.get(idx);
                 String backupVolumeUuid = backedVolumesUUIDs.get(idx);
-                Pair<String, String> bkpPathAndVolUuid = getBackupPath(null, backupPath, diskType, backupVolumeUuid);
+                List<String> localBackupPaths = getLocalBackupPaths(backupPath, backupFiles, backupFileChains, idx, getLegacyBackupFileName(diskType, backupVolumeUuid));
                 diskType = "datadisk";
-                verifyBackupFile(bkpPathAndVolUuid.first(), bkpPathAndVolUuid.second());
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, restoreVolumePath, bkpPathAndVolUuid.first(), timeout)) {
-                    throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", bkpPathAndVolUuid.second()));
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, restoreVolumePath, localBackupPaths, timeout)) {
+                    throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", backupVolumeUuid));
                 }
             }
         } finally {
@@ -126,17 +121,18 @@ private void restoreVolumesOfExistingVM(KVMStoragePoolManager storagePoolMgr, Li
         }
     }
 
-    private void restoreVolumesOfDestroyedVMs(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> volumePools, List<String> volumePaths, String vmName, String backupPath, int timeout) {
+    private void restoreVolumesOfDestroyedVMs(KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> volumePools, List<String> volumePaths, String vmName, String backupPath,
+                                              List<String> backupFiles, List<String> backupFileChains, int timeout) {
         String diskType = "root";
         try {
             for (int i = 0; i < volumePaths.size(); i++) {
                 PrimaryDataStoreTO volumePool = volumePools.get(i);
                 String volumePath = volumePaths.get(i);
-                Pair<String, String> bkpPathAndVolUuid = getBackupPath(volumePath, backupPath, diskType, null);
+                String volumeUuid = volumePath.substring(volumePath.lastIndexOf(File.separator) + 1);
+                List<String> localBackupPaths = getLocalBackupPaths(backupPath, backupFiles, backupFileChains, i, getLegacyBackupFileName(diskType, volumeUuid));
                 diskType = "datadisk";
-                verifyBackupFile(bkpPathAndVolUuid.first(), bkpPathAndVolUuid.second());
-                if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, bkpPathAndVolUuid.first(), timeout)) {
-                    throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", bkpPathAndVolUuid.second()));
+                if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout)) {
+                    throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUuid));
                 }
             }
         } finally {
@@ -145,13 +141,12 @@ private void restoreVolumesOfDestroyedVMs(KVMStoragePoolManager storagePoolMgr,
     }
 
     private void restoreVolume(KVMStoragePoolManager storagePoolMgr, String backupPath, PrimaryDataStoreTO volumePool, String volumePath, String diskType, String volumeUUID,
+                               List<String> backupFiles, List<String> backupFileChains,
                                Pair<String, VirtualMachine.State> vmNameAndState, int timeout, String cacheMode) {
-        Pair<String, String> bkpPathAndVolUuid;
         try {
-            bkpPathAndVolUuid = getBackupPath(volumePath, backupPath, diskType, volumeUUID);
-            verifyBackupFile(bkpPathAndVolUuid.first(), bkpPathAndVolUuid.second());
-            if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, bkpPathAndVolUuid.first(), timeout, true)) {
-                throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", bkpPathAndVolUuid.second()));
+            List<String> localBackupPaths = getLocalBackupPaths(backupPath, backupFiles, backupFileChains, 0, getLegacyBackupFileName(diskType, volumeUUID));
+            if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout, true)) {
+                throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUUID));
             }
             if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
                 if (!attachVolumeToVm(storagePoolMgr, vmNameAndState.first(), volumePool, volumePath, cacheMode)) {
@@ -172,11 +167,37 @@ private void deleteBackupDirectory(String backupDirectory) {
         }
     }
 
-    private Pair<String, String> getBackupPath(String volumePath, String backupPath, String diskType, String volumeUuid) {
-        String volUuid = Objects.isNull(volumeUuid) ? volumePath.substring(volumePath.lastIndexOf(File.separator) + 1) : volumeUuid;
-        String backupFileName = String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), volUuid);
-        backupPath = String.format(FILE_PATH_PLACEHOLDER, backupPath, backupFileName);
-        return new Pair<>(backupPath, volUuid);
+    private List<String> getLocalBackupPaths(String backupPath, List<String> backupFiles, List<String> backupFileChains, int index, String legacyBackupFileName) {
+        List<String> localPaths = new ArrayList<>();
+        if (backupFileChains != null && backupFileChains.size() > index && StringUtils.isNotBlank(backupFileChains.get(index))) {
+            for (String chainPath : backupFileChains.get(index).split(";")) {
+                if (StringUtils.isBlank(chainPath)) {
+                    continue;
+                }
+                localPaths.add(resolveBackupPath(backupPath, chainPath));
+            }
+        }
+        if (localPaths.isEmpty() && backupFiles != null && backupFiles.size() > index && StringUtils.isNotBlank(backupFiles.get(index))) {
+            localPaths.add(resolveBackupPath(backupPath, backupFiles.get(index)));
+        }
+        if (localPaths.isEmpty()) {
+            localPaths.add(String.format(FILE_PATH_PLACEHOLDER, backupPath, legacyBackupFileName));
+        }
+        return localPaths;
+    }
+
+    private String resolveBackupPath(String backupPath, String chainPath) {
+        if (chainPath.startsWith("/")) {
+            return chainPath;
+        }
+        if (chainPath.contains("/")) {
+            return String.format(FILE_PATH_PLACEHOLDER, backupPath, chainPath);
+        }
+        return String.format(FILE_PATH_PLACEHOLDER, backupPath, chainPath);
+    }
+
+    private String getLegacyBackupFileName(String diskType, String volumeUuid) {
+        return String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), volumeUuid);
     }
 
     private boolean checkBackupFileImage(String backupPath) {
@@ -189,20 +210,90 @@ private boolean checkBackupPathExists(String backupPath) {
         return exitValue == 0;
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPath, timeout, false);
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout) {
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, false);
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+        if (backupPaths == null || backupPaths.isEmpty()) {
+            return false;
+        }
         if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-            int exitValue = Script.runSimpleBashScriptForExitValue(String.format(RSYNC_COMMAND, backupPath, volumePath));
-            return exitValue == 0;
+            if (backupPaths.size() > 1 && backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+                throw new CloudRuntimeException("Incremental RBD backup chains can only be restored to RBD storage pools");
+            }
+            return replaceFileVolumeWithBackup(volumePath, getLastExistingBackupPath(backupPaths), timeout);
+        }
+
+        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
+    }
+
+    private String getFirstExistingBackupPath(List<String> backupPaths) {
+        for (String backupPath : backupPaths) {
+            if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
+                return backupPath;
+            }
+        }
+        return backupPaths.get(0);
+    }
+
+    private String getLastExistingBackupPath(List<String> backupPaths) {
+        for (int i = backupPaths.size() - 1; i >= 0; i--) {
+            String backupPath = backupPaths.get(i);
+            if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
+                return backupPath;
+            }
+        }
+        return backupPaths.get(backupPaths.size() - 1);
+    }
+
+    private boolean replaceFileVolumeWithBackup(String volumePath, String backupPath, int timeout) {
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
+            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
+            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
+            qemu.convert(srcBackupFile, destVolumeFile);
+            return true;
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
+            logger.error("Failed to convert backup {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
         }
+    }
 
-        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPath, timeout, createTargetVolume);
+    private QemuImg.PhysicalDiskFormat getBackupFileFormat(String backupPath) {
+        if (backupPath.endsWith(".raw")) {
+            return QemuImg.PhysicalDiskFormat.RAW;
+        }
+        return QemuImg.PhysicalDiskFormat.QCOW2;
+    }
+
+    private QemuImg.PhysicalDiskFormat getFileVolumeFormat(String volumePath) {
+        if (!Files.exists(Paths.get(volumePath))) {
+            return QemuImg.PhysicalDiskFormat.QCOW2;
+        }
+        try {
+            QemuImg qemu = new QemuImg(0);
+            java.util.Map<String, String> info = qemu.info(new QemuImgFile(volumePath));
+            String format = info.get("file_format");
+            if (StringUtils.isNotBlank(format)) {
+                return QemuImg.PhysicalDiskFormat.valueOf(format.toUpperCase(Locale.ROOT));
+            }
+        } catch (QemuImgException | LibvirtException | IllegalArgumentException e) {
+            logger.warn("Failed to detect file volume format for path {}. Falling back to qcow2.", volumePath, e);
+        }
+        return QemuImg.PhysicalDiskFormat.QCOW2;
     }
 
-    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+        if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+            return restoreIncrementalRbdBackupChain(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
+        }
+
+        String backupPath = getFirstExistingBackupPath(backupPaths);
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
         QemuImg qemu;
         try {
@@ -236,6 +327,59 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         return true;
     }
 
+    private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths,
+                                                     int timeout, boolean createTargetVolume) {
+        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
+            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
+        }
+
+        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
+            return false;
+        }
+
+        KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        for (int index = 1; index < backupPaths.size(); index++) {
+            String backupPath = backupPaths.get(index);
+            if (!backupPath.endsWith(".rbdiff")) {
+                continue;
+            }
+            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, volumePath);
+            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                logger.error("Failed to import RBD diff {} into volume {}", backupPath, volumePath);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" import-diff ").append(backupPath).append(" ").append(volumePath);
+        return command.toString();
+    }
+
+    private String formatRbdMonHosts(String hosts, int port) {
+        String[] hostValues = hosts.split(",");
+        List<String> formattedHosts = new ArrayList<>();
+        for (String host : hostValues) {
+            String normalizedHost = host.replace("[", "").replace("]", "").trim();
+            if (StringUtils.isBlank(normalizedHost)) {
+                continue;
+            }
+            formattedHosts.add(port > 0 ? normalizedHost + ":" + port : normalizedHost);
+        }
+        return String.join(",", formattedHosts);
+    }
+
     private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr, String vmName, PrimaryDataStoreTO volumePool, String volumePath, String cacheMode) {
         String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
         int exitValue;
@@ -316,4 +460,4 @@ private void fetchBackupFile(String hostName, String backupPath) {
                     hostName, backupPath, backupPath));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
index 277d38e8573d..91abe8f86345 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
@@ -44,6 +44,12 @@ public class LibvirtCommvaultTakeBackupCommandWrapper extends CommandWrapper<Com
     public Answer execute(CommvaultTakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
         final String vmName = command.getVmName();
         final String backupPath = command.getBackupPath();
+        final String backupType = command.getBackupType();
+        final String checkpointName = command.getCheckpointName();
+        final String parentBackupPath = command.getParentBackupPath();
+        final String parentCheckpointName = command.getParentCheckpointName();
+        final String parentCheckpointPath = command.getParentCheckpointPath();
+        final List<String> backupFiles = command.getBackupFiles();
         List<PrimaryDataStoreTO> volumePools = command.getVolumePools();
         final List<String> volumePaths = command.getVolumePaths();
         KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
@@ -69,6 +75,12 @@ public Answer execute(CommvaultTakeBackupCommand command, LibvirtComputingResour
                 "-o", "backup",
                 "-v", vmName,
                 "-p", backupPath,
+                "-b", Objects.nonNull(backupType) ? backupType : "",
+                "-c", Objects.nonNull(checkpointName) ? checkpointName : "",
+                "-r", Objects.nonNull(parentBackupPath) ? parentBackupPath : "",
+                "-i", Objects.nonNull(parentCheckpointName) ? parentCheckpointName : "",
+                "-j", Objects.nonNull(parentCheckpointPath) ? parentCheckpointPath : "",
+                "-f", backupFiles == null || backupFiles.isEmpty() ? "" : String.join(",", backupFiles),
                 "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
                 "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
         });
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 85300afeec24..54b97130619a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -44,8 +44,10 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 
 @ResourceWrapper(handles = RestoreBackupCommand.class)
@@ -57,8 +59,6 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
     private static final String ATTACH_QCOW2_DISK_COMMAND = " virsh attach-disk %s %s %s --driver qemu --subdriver qcow2 --cache none";
     private static final String ATTACH_RBD_DISK_XML_COMMAND = " virsh attach-device %s /dev/stdin <<EOF%sEOF";
     private static final String CURRRENT_DEVICE = "virsh domblklist --domain %s | tail -n 3 | head -n 1 | awk '{print $1}'";
-    private static final String RSYNC_COMMAND = "rsync -az %s %s";
-
     @Override
     public Answer execute(RestoreBackupCommand command, LibvirtComputingResource serverResource) {
         String vmName = command.getVmName();
@@ -78,6 +78,7 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
         KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
         List<String> volumePaths = command.getVolumePaths();
         List<String> backupFiles = command.getBackupFiles();
+        List<String> backupFileChains = command.getBackupFileChains();
 
         String newVolumeId = null;
         try {
@@ -85,14 +86,15 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
             if (Objects.isNull(vmExists)) {
                 String volumePath = volumePaths.get(0);
                 String backupFile = backupFiles.get(0);
+                String backupFileChain = backupFileChains != null && !backupFileChains.isEmpty() ? backupFileChains.get(0) : null;
                 int lastIndex = volumePath.lastIndexOf("/");
                 newVolumeId = volumePath.substring(lastIndex + 1);
-                restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, diskType, backupFile,
+                restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, backupFile, backupFileChain,
                         new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
             } else if (Boolean.TRUE.equals(vmExists)) {
-                restoreVolumesOfExistingVM(volumePaths, backupPath, backupFiles, backupRepoType, backupRepoAddress, mountOptions, mountDirectory, timeout, storagePoolMgr, restoreVolumePools.get(0));
+                restoreVolumesOfExistingVM(volumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools.get(0));
             } else {
-                restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, backupFiles, backupRepoType, backupRepoAddress, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), timeout);
+                restoreVolumesOfDestroyedVMs(volumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), timeout);
             }
         } catch (CloudRuntimeException e) {
             String errorMessage = e.getMessage() != null ? e.getMessage() : "";
@@ -102,16 +104,15 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
         return new BackupAnswer(command, true, newVolumeId);
     }
 
-    private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupPath, List<String> backupFiles,
-                                             String backupRepoType, String backupRepoAddress, String mountOptions, String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool) {
-        String diskType = "root";
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
+                                            String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool) {
         try {
             for (int idx = 0; idx < volumePaths.size(); idx++) {
                 String volumePath = volumePaths.get(idx);
                 String backupFile = backupFiles.get(idx);
-                String bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
-                diskType = "datadisk";
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, bkpPath, timeout)) {
+                String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
+                List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
             }
@@ -121,17 +122,16 @@ private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupP
         }
     }
 
-    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String vmName, String backupPath, List<String> backupFiles,
-                                              String backupRepoType, String backupRepoAddress, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, Integer timeout) {
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
+                                              String backupRepoAddress, String backupRepoType, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, Integer timeout) {
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
-        String diskType = "root";
         try {
             for (int idx = 0; idx < volumePaths.size(); idx++) {
                 String volumePath = volumePaths.get(idx);
                 String backupFile = backupFiles.get(idx);
-                String bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
-                diskType = "datadisk";
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, bkpPath, timeout)) {
+                String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
+                List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
             }
@@ -141,13 +141,12 @@ private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String vmNam
         }
     }
 
-    private void restoreVolume(String backupPath, String backupRepoType, String backupRepoAddress, String volumePath,
-                               String diskType, String backupFile, Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
+    private void restoreVolume(String backupPath, String backupRepoType, String backupRepoAddress, String volumePath, String backupFile, String backupFileChain,
+                               Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
-        String bkpPath;
         try {
-            bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
-            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, bkpPath, mountTimeout)) {
+            List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, mountTimeout)) {
                 throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
             }
             if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
@@ -211,11 +210,25 @@ private void deleteTemporaryDirectory(String backupDirectory) {
         }
     }
 
-    private String getBackupPath(String mountDirectory, String backupPath, String backupFile, String diskType) {
-        String bkpPath = String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath);
-        String backupFileName = String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), backupFile);
-        bkpPath = String.format(FILE_PATH_PLACEHOLDER, bkpPath, backupFileName);
-        return bkpPath;
+    private List<String> getMountedBackupPaths(String mountDirectory, String backupPath, String backupFile, String backupFileChain) {
+        List<String> mountedPaths = new ArrayList<>();
+        if (StringUtils.isNotBlank(backupFileChain)) {
+            for (String chainPath : backupFileChain.split(";")) {
+                if (StringUtils.isBlank(chainPath)) {
+                    continue;
+                }
+                String normalizedPath = chainPath.startsWith("/") ? chainPath.substring(1) : chainPath;
+                if (!normalizedPath.contains("/") && StringUtils.isNotBlank(backupPath)) {
+                    mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), normalizedPath));
+                } else {
+                    mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, mountDirectory, normalizedPath));
+                }
+            }
+        }
+        if (mountedPaths.isEmpty() && StringUtils.isNotBlank(backupFile)) {
+            mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), backupFile));
+        }
+        return mountedPaths;
     }
 
     private boolean checkBackupFileImage(String backupPath) {
@@ -228,20 +241,80 @@ private boolean checkBackupPathExists(String backupPath) {
         return exitValue == 0;
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPath, timeout, false);
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout) {
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, false);
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+        if (backupPaths == null || backupPaths.isEmpty()) {
+            return false;
+        }
         if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-            int exitValue = Script.runSimpleBashScriptForExitValue(String.format(RSYNC_COMMAND, backupPath, volumePath));
-            return exitValue == 0;
+            if (backupPaths.size() > 1 && backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+                throw new CloudRuntimeException("Incremental RBD backup chains can only be restored to RBD storage pools");
+            }
+            return replaceFileVolumeWithBackup(volumePath, getFirstExistingBackupPath(backupPaths), timeout);
         }
 
-        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPath, timeout, createTargetVolume);
+        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
     }
 
-    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+    private String getFirstExistingBackupPath(List<String> backupPaths) {
+        for (String backupPath : backupPaths) {
+            if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
+                return backupPath;
+            }
+        }
+        return backupPaths.get(0);
+    }
+
+    private boolean replaceFileVolumeWithBackup(String volumePath, String backupPath, int timeout) {
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
+            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
+            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
+            qemu.convert(srcBackupFile, destVolumeFile);
+            return true;
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
+            logger.error("Failed to convert backup {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
+        }
+    }
+
+    private QemuImg.PhysicalDiskFormat getBackupFileFormat(String backupPath) {
+        if (backupPath.endsWith(".raw")) {
+            return QemuImg.PhysicalDiskFormat.RAW;
+        }
+        return QemuImg.PhysicalDiskFormat.QCOW2;
+    }
+
+    private QemuImg.PhysicalDiskFormat getFileVolumeFormat(String volumePath) {
+        if (!Files.exists(Paths.get(volumePath))) {
+            return QemuImg.PhysicalDiskFormat.QCOW2;
+        }
+        try {
+            QemuImg qemu = new QemuImg(0);
+            Map<String, String> info = qemu.info(new QemuImgFile(volumePath));
+            String format = info.get("file_format");
+            if (StringUtils.isNotBlank(format)) {
+                return QemuImg.PhysicalDiskFormat.valueOf(format.toUpperCase(Locale.ROOT));
+            }
+        } catch (QemuImgException | LibvirtException | IllegalArgumentException e) {
+            logger.warn("Failed to detect file volume format for path {}. Falling back to qcow2.", volumePath, e);
+        }
+        return QemuImg.PhysicalDiskFormat.QCOW2;
+    }
+
+    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+        if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+            return restoreIncrementalRbdBackupChain(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
+        }
+
+        String backupPath = getFirstExistingBackupPath(backupPaths);
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
         QemuImg qemu;
         try {
@@ -258,7 +331,7 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         QemuImgFile srcBackupFile = null;
         QemuImgFile destVolumeFile = null;
         try {
-            srcBackupFile = new QemuImgFile(backupPath, QemuImg.PhysicalDiskFormat.QCOW2);
+            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
             String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
             destVolumeFile = new QemuImgFile(rbdDestVolumeFile, QemuImg.PhysicalDiskFormat.RAW);
 
@@ -275,6 +348,59 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         return true;
     }
 
+    private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths,
+                                                     int timeout, boolean createTargetVolume) {
+        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
+            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
+        }
+
+        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
+            return false;
+        }
+
+        KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        for (int index = 1; index < backupPaths.size(); index++) {
+            String backupPath = backupPaths.get(index);
+            if (!backupPath.endsWith(".rbdiff")) {
+                continue;
+            }
+            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, volumePath);
+            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                logger.error("Failed to import RBD diff {} into volume {}", backupPath, volumePath);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" import-diff ").append(backupPath).append(" ").append(volumePath);
+        return command.toString();
+    }
+
+    private String formatRbdMonHosts(String hosts, int port) {
+        String[] hostValues = hosts.split(",");
+        List<String> formattedHosts = new ArrayList<>();
+        for (String host : hostValues) {
+            String normalizedHost = host.replace("[", "").replace("]", "").trim();
+            if (StringUtils.isBlank(normalizedHost)) {
+                continue;
+            }
+            formattedHosts.add(port > 0 ? normalizedHost + ":" + port : normalizedHost);
+        }
+        return String.join(",", formattedHosts);
+    }
+
     private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr, String vmName, PrimaryDataStoreTO volumePool, String volumePath, String cacheMode) {
         String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
         int exitValue;
@@ -338,4 +464,4 @@ private String getXmlForRbdDisk(KVMStoragePoolManager storagePoolMgr, PrimaryDat
         diskBuilder.append("</disk>\n");
         return diskBuilder.toString();
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
index 11fa605908a6..a8d2de1a6cc4 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
@@ -46,11 +46,17 @@ public class LibvirtTakeBackupCommandWrapper extends CommandWrapper<TakeBackupCo
     public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
         final String vmName = command.getVmName();
         final String backupPath = command.getBackupPath();
+        final String backupType = command.getBackupType();
+        final String checkpointName = command.getCheckpointName();
+        final String parentBackupPath = command.getParentBackupPath();
+        final String parentCheckpointName = command.getParentCheckpointName();
+        final String parentCheckpointPath = command.getParentCheckpointPath();
         final String backupRepoType = command.getBackupRepoType();
         final String backupRepoAddress = command.getBackupRepoAddress();
         final String mountOptions = command.getMountOptions();
         List<PrimaryDataStoreTO> volumePools = command.getVolumePools();
         final List<String> volumePaths = command.getVolumePaths();
+        final List<String> backupFiles = command.getBackupFiles();
         KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
 
         List<String> diskPaths = new ArrayList<>();
@@ -77,7 +83,13 @@ public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvir
                 "-s", backupRepoAddress,
                 "-m", Objects.nonNull(mountOptions) ? mountOptions : "",
                 "-p", backupPath,
+                "-b", Objects.nonNull(backupType) ? backupType : "",
+                "-c", Objects.nonNull(checkpointName) ? checkpointName : "",
+                "-r", Objects.nonNull(parentBackupPath) ? parentBackupPath : "",
+                "-i", Objects.nonNull(parentCheckpointName) ? parentCheckpointName : "",
+                "-j", Objects.nonNull(parentCheckpointPath) ? parentCheckpointPath : "",
                 "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
+                "-f", CollectionUtils.isNullOrEmpty(backupFiles) ? "" : String.join(",", backupFiles),
                 "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
         });
 
diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 0493654fce02..675062542b28 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -1,42 +1,26 @@
 #!/usr/bin/bash
 
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
 set -eo pipefail
 
-# CloudStack B&R Commvault Backup and Recovery Tool for KVM
-
-# TODO: do libvirt/logging etc checks
-
-### Declare variables ###
-
 OP=""
 VM=""
 BACKUP_DIR=""
 DISK_PATHS=""
 QUIESCE=""
+BACKUP_TYPE="FULL"
+CHECKPOINT_NAME=""
+PARENT_BACKUP_DIR=""
+PARENT_CHECKPOINT_NAME=""
+PARENT_CHECKPOINT_PATH=""
+BACKUP_FILES=""
+DUMMY_VM=""
 logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
 
 log() {
   [[ "$verb" -eq 1 ]] && builtin echo "$@"
-  if [[ "$1" == "-ne"  || "$1" == "-e" || "$1" == "-n" ]]; then
+  if [[ "$1" == "-ne" || "$1" == "-e" || "$1" == "-n" ]]; then
     builtin echo -e "$(date '+%Y-%m-%d %H-%M-%S>')" "${@: 2}" >> "$logFile"
   else
     builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$@" >> "$logFile"
@@ -46,20 +30,17 @@ log() {
 vercomp() {
   local IFS=.
   local i ver1=($1) ver2=($3)
-
-  # Compare each segment of the version numbers
   for ((i=0; i<${#ver1[@]}; i++)); do
-      if [[ -z ${ver2[i]} ]]; then
-          ver2[i]=0
-      fi
-
-      if ((10#${ver1[i]} > 10#${ver2[i]})); then
-          return  0 # Version 1 is greater
-      elif ((10#${ver1[i]} < 10#${ver2[i]})); then
-          return 2  # Version 2 is greater
-      fi
+    if [[ -z ${ver2[i]} ]]; then
+      ver2[i]=0
+    fi
+    if ((10#${ver1[i]} > 10#${ver2[i]})); then
+      return 0
+    elif ((10#${ver1[i]} < 10#${ver2[i]})); then
+      return 2
+    fi
   done
-  return 0  # Versions are equal
+  return 0
 }
 
 sanity_checks() {
@@ -67,11 +48,8 @@ sanity_checks() {
   libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1)
   apiVersion=$(virsh version | grep API | awk '{print $(NF)}')
 
-  # Compare qemu version (hvVersion >= 4.2.0)
   vercomp "$hvVersion" ">=" "4.2.0"
   hvStatus=$?
-
-  # Compare libvirt version (libvVersion >= 7.2.0)
   vercomp "$libvVersion" ">=" "7.2.0"
   libvStatus=$?
 
@@ -81,44 +59,197 @@ sanity_checks() {
     echo "Failure... Your QEMU version $hvVersion or libvirt version $libvVersion is unsupported. Consider upgrading to the required minimum version of QEMU: 4.2.0 and Libvirt: 7.2.0"
     exit 1
   fi
+}
+
+cleanup() {
+  local status=0
+  cleanup_dummy_vm
+  rm -rf "$dest" || { echo "Failed to delete $dest"; status=1; }
+  if [[ $status -ne 0 ]]; then
+    echo "Backup cleanup failed"
+    exit $EXIT_CLEANUP_FAILED
+  fi
+}
+
+cleanup_dummy_vm() {
+  if [[ -z "$DUMMY_VM" ]]; then
+    return
+  fi
+  virsh -c qemu:///system destroy "$DUMMY_VM" > /dev/null 2>&1 || true
+  virsh -c qemu:///system undefine "$DUMMY_VM" --nvram > /dev/null 2>&1 || true
+  DUMMY_VM=""
+}
+
+split_csv() {
+  local csv="$1"
+  IFS=',' read -r -a SPLIT_CSV_RESULT <<< "$csv"
+}
 
-  log -ne "Environment Sanity Checks successfully passed"
+get_backup_file_by_index() {
+  local index="$1"
+  split_csv "$BACKUP_FILES"
+  echo "${SPLIT_CSV_RESULT[$index]}"
 }
 
-### Operation methods ###
+dump_checkpoint_xml() {
+  local vm_name="$1"
+  if [[ -n "$CHECKPOINT_NAME" ]]; then
+    virsh -c qemu:///system checkpoint-dumpxml --domain "$vm_name" --checkpointname "$CHECKPOINT_NAME" --no-domain > "$dest/checkpoints/$CHECKPOINT_NAME.xml" 2>/dev/null || true
+  fi
+}
+
+redefine_checkpoint_if_needed() {
+  local vm_name="$1"
+  local checkpoint_file="$2"
+  if [[ -z "$PARENT_CHECKPOINT_NAME" || -z "$checkpoint_file" || ! -f "$checkpoint_file" ]]; then
+    return
+  fi
+  if virsh -c qemu:///system checkpoint-info --domain "$vm_name" --checkpointname "$PARENT_CHECKPOINT_NAME" > /dev/null 2>&1; then
+    return
+  fi
+  if ! virsh -c qemu:///system checkpoint-create --domain "$vm_name" --xmlfile "$checkpoint_file" --redefine > /dev/null 2>&1; then
+    echo "Failed to redefine checkpoint $PARENT_CHECKPOINT_NAME on domain $vm_name"
+    exit 1
+  fi
+}
+
+create_dummy_vm_xml() {
+  local dummy_vm="$1"
+  local xml_file="$2"
+  {
+    echo "<domain type='kvm'>"
+    echo "  <name>$dummy_vm</name>"
+    echo "  <memory unit='MiB'>256</memory>"
+    echo "  <currentMemory unit='MiB'>256</currentMemory>"
+    echo "  <vcpu placement='static'>1</vcpu>"
+    echo "  <os><type arch='x86_64' machine='pc'>hvm</type></os>"
+    echo "  <devices>"
+    echo "    <emulator>/usr/bin/qemu-system-x86_64</emulator>"
+  } > "$xml_file"
+
+  split_csv "$DISK_PATHS"
+  for index in "${!SPLIT_CSV_RESULT[@]}"; do
+    local disk_path="${SPLIT_CSV_RESULT[$index]}"
+    local disk_name
+    disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
+    if [[ "$disk_path" == rbd:* ]]; then
+      local source_name="${disk_path#rbd:}"
+      source_name="${source_name%%:mon_host=*}"
+      local mon_hosts="${disk_path#*:mon_host=}"
+      mon_hosts="${mon_hosts%%:*}"
+      {
+        echo "    <disk type='network' device='disk'>"
+        echo "      <driver name='qemu' type='raw'/>"
+        echo "      <source protocol='rbd' name='$source_name'>"
+        IFS=';' read -r -a hosts <<< "$mon_hosts"
+        for host in "${hosts[@]}"; do
+          echo "        <host name='$host'/>"
+        done
+        echo "      </source>"
+        echo "      <target dev='vd$disk_name' bus='virtio'/>"
+        echo "    </disk>"
+      } >> "$xml_file"
+    else
+      {
+        echo "    <disk type='file' device='disk'>"
+        echo "      <driver name='qemu' type='qcow2'/>"
+        echo "      <source file='$disk_path'/>"
+        echo "      <target dev='vd$disk_name' bus='virtio'/>"
+        echo "    </disk>"
+      } >> "$xml_file"
+    fi
+  done
+
+  {
+    echo "    <console type='pty'/>"
+    echo "  </devices>"
+    echo "</domain>"
+  } >> "$xml_file"
+}
+
+create_backup_xml_for_dummy_vm() {
+  local backup_xml="$1"
+  local checkpoint_xml="$2"
+
+  echo "<domainbackup mode='push'><disks>" > "$backup_xml"
+  split_csv "$DISK_PATHS"
+  for index in "${!SPLIT_CSV_RESULT[@]}"; do
+    local disk_name
+    disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
+    local target_file="$dest/$(get_backup_file_by_index "$index")"
+    echo "<disk name='vd$disk_name' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$target_file'/>" >> "$backup_xml"
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$backup_xml"
+    fi
+    echo "</disk>" >> "$backup_xml"
+  done
+  echo "</disks></domainbackup>" >> "$backup_xml"
+
+  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$checkpoint_xml"
+  for index in "${!SPLIT_CSV_RESULT[@]}"; do
+    local disk_name
+    disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
+    echo "<disk name='vd$disk_name' checkpoint='bitmap'/>" >> "$checkpoint_xml"
+  done
+  echo "</disks></domaincheckpoint>" >> "$checkpoint_xml"
+}
+
+parse_rbd_uri() {
+  local uri="$1"
+  RBD_IMAGE="${uri#rbd:}"
+  RBD_IMAGE="${RBD_IMAGE%%:mon_host=*}"
+  local remainder="${uri#*:mon_host=}"
+  RBD_MON_HOSTS="${remainder%%:*}"
+}
+
+rbd_cli() {
+  local mon_hosts="$1"
+  shift
+  local mon_arg="${mon_hosts//;/,}"
+  rbd -m "$mon_arg" "$@"
+}
 
 backup_running_vm() {
-  mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
-
-  name="root"
-  echo "<domainbackup mode='push'><disks>" > $dest/backup.xml
-  for disk in $(virsh -c qemu:///system domblklist $VM --details 2>/dev/null | awk '/disk/{print$3}'); do
-    volpath=$(virsh -c qemu:///system domblklist $VM --details | awk "/$disk/{print $4}" | sed 's/.*\///')
-    echo "<disk name='$disk' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$dest/$name.$volpath.qcow2' /></disk>" >> $dest/backup.xml
-    name="datadisk"
+  mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
+  local parent_checkpoint_file=""
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
+    parent_checkpoint_file="$PARENT_CHECKPOINT_PATH"
+    redefine_checkpoint_if_needed "$VM" "$parent_checkpoint_file"
+  fi
+
+  echo "<domainbackup mode='push'><disks>" > "$dest/backup.xml"
+  local index=0
+  for disk in $(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/{print $3}'); do
+    local target_file="$dest/$(get_backup_file_by_index "$index")"
+    echo "<disk name='$disk' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$target_file'/>" >> "$dest/backup.xml"
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$dest/backup.xml"
+    fi
+    echo "</disk>" >> "$dest/backup.xml"
+    index=$((index + 1))
   done
-  echo "</disks></domainbackup>" >> $dest/backup.xml
+  echo "</disks></domainbackup>" >> "$dest/backup.xml"
+
+  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$dest/checkpoint.xml"
+  for disk in $(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/{print $3}'); do
+    echo "<disk name='$disk' checkpoint='bitmap'/>" >> "$dest/checkpoint.xml"
+  done
+  echo "</disks></domaincheckpoint>" >> "$dest/checkpoint.xml"
 
   local thaw=0
   if [[ ${QUIESCE} == "true" ]]; then
-    log -ne "Pause option is enabled on a running virtual machine"
     if virsh -c qemu:///system qemu-agent-command "$VM" '{"execute":"guest-fsfreeze-freeze"}' > /dev/null 2>/dev/null; then
       thaw=1
     fi
   fi
 
-  # Start push backup
   local backup_begin=0
-  if virsh -c qemu:///system backup-begin --domain $VM --backupxml $dest/backup.xml 2>&1 > /dev/null; then
-    backup_begin=1;
+  if virsh -c qemu:///system backup-begin --domain "$VM" --backupxml "$dest/backup.xml" --checkpointxml "$dest/checkpoint.xml" > /dev/null 2>&1; then
+    backup_begin=1
   fi
 
   if [[ $thaw -eq 1 ]]; then
-    if ! response=$(virsh -c qemu:///system qemu-agent-command "$VM" '{"execute":"guest-fsfreeze-thaw"}' 2>&1 > /dev/null); then
-      echo "Failed to thaw the filesystem for vm $VM: $response"
-      cleanup
-      exit 1
-    fi
+    virsh -c qemu:///system qemu-agent-command "$VM" '{"execute":"guest-fsfreeze-thaw"}' > /dev/null 2>&1 || true
   fi
 
   if [[ $backup_begin -ne 1 ]]; then
@@ -126,106 +257,110 @@ backup_running_vm() {
     exit 1
   fi
 
-  # Backup domain information
-  virsh -c qemu:///system dumpxml $VM > $dest/domain-config.xml 2>/dev/null
-  virsh -c qemu:///system dominfo $VM > $dest/dominfo.xml 2>/dev/null
-  virsh -c qemu:///system domiflist $VM > $dest/domiflist.xml 2>/dev/null
-  virsh -c qemu:///system domblklist $VM > $dest/domblklist.xml 2>/dev/null
-
   while true; do
-    status=$(virsh -c qemu:///system domjobinfo $VM --completed --keep-completed | awk '/Job type:/ {print $3}')
+    status=$(virsh -c qemu:///system domjobinfo "$VM" --completed --keep-completed | awk '/Job type:/ {print $3}')
     case "$status" in
-      Completed)
-        break ;;
-      Failed)
-        echo "Virsh backup job failed"
-        cleanup ;;
+      Completed) break ;;
+      Failed) echo "Virsh backup job failed"; cleanup ;;
     esac
     sleep 5
   done
-  sync
 
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
+    split_csv "$BACKUP_FILES"
+    for backup_file in "${SPLIT_CSV_RESULT[@]}"; do
+      qemu-img rebase -u -F qcow2 -b "$PARENT_BACKUP_DIR/$backup_file" "$dest/$backup_file" > /dev/null 2>&1 || true
+    done
+  fi
+
+  dump_checkpoint_xml "$VM"
+  rm -f "$dest/backup.xml" "$dest/checkpoint.xml"
+  sync
 }
 
 backup_stopped_vm() {
-  mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
+  mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
+  local dummy_vm="DUMMY-VM-${CHECKPOINT_NAME//./-}"
+  DUMMY_VM="$dummy_vm"
+  local dummy_xml="$dest/dummy-vm.xml"
+  local backup_xml="$dest/backup.xml"
+  local checkpoint_xml="$dest/checkpoint.xml"
+
+  create_dummy_vm_xml "$dummy_vm" "$dummy_xml"
+  virsh -c qemu:///system define "$dummy_xml" > /dev/null
+  virsh -c qemu:///system start "$dummy_vm" --paused > /dev/null
+
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
+    redefine_checkpoint_if_needed "$dummy_vm" "$PARENT_CHECKPOINT_PATH"
+  fi
 
-  IFS=","
+  create_backup_xml_for_dummy_vm "$backup_xml" "$checkpoint_xml"
+  if ! virsh -c qemu:///system backup-begin --domain "$dummy_vm" --backupxml "$backup_xml" --checkpointxml "$checkpoint_xml" > /dev/null 2>&1; then
+    echo "Failed to start backup for dummy VM $dummy_vm"
+    cleanup
+    exit 1
+  fi
 
-  name="root"
-  for disk in $DISK_PATHS; do
-    if [[ "$disk" == rbd:* ]]; then
-      # disk for rbd => rbd:<pool>/<uuid>:mon_host=<monitor_host>...
-      # sample: rbd:cloudstack/53d5c355-d726-4d3e-9422-046a503a0b12:mon_host=10.0.1.2...
-      beforeUuid="${disk#*/}"     # Remove up to first slash after rbd:
-      volUuid="${beforeUuid%%:*}" # Remove everything after colon to get the uuid
-    else
-      volUuid="${disk##*/}"
-    fi
-    output="$dest/$name.$volUuid.qcow2"
-    if ! qemu-img convert -O qcow2 "$disk" "$output" > "$logFile" 2> >(cat >&2); then
-      echo "qemu-img convert failed for $disk $output"
-      cleanup
-    fi
-    name="datadisk"
+  while true; do
+    status=$(virsh -c qemu:///system domjobinfo "$dummy_vm" --completed --keep-completed | awk '/Job type:/ {print $3}')
+    case "$status" in
+      Completed) break ;;
+      Failed) echo "Virsh backup job failed for dummy VM $dummy_vm"; cleanup ;;
+    esac
+    sleep 5
   done
-  sync
 
-}
-
-cleanup() {
-  local status=0
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
+    split_csv "$BACKUP_FILES"
+    for backup_file in "${SPLIT_CSV_RESULT[@]}"; do
+      qemu-img rebase -u -F qcow2 -b "$PARENT_BACKUP_DIR/$backup_file" "$dest/$backup_file" > /dev/null 2>&1 || true
+    done
+  fi
 
-  rm -rf "$dest" || { echo "Failed to delete $dest"; status=1; }
+  dump_checkpoint_xml "$dummy_vm"
+  cleanup_dummy_vm
+  rm -f "$backup_xml" "$checkpoint_xml" "$dummy_xml"
+  sync
+}
 
-  if [[ $status -ne 0 ]]; then
-    echo "Backup cleanup failed"
-    exit $EXIT_CLEANUP_FAILED
-  fi
+backup_rbd_volumes() {
+  mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
+  split_csv "$DISK_PATHS"
+  for index in "${!SPLIT_CSV_RESULT[@]}"; do
+    local disk_path="${SPLIT_CSV_RESULT[$index]}"
+    parse_rbd_uri "$disk_path"
+    local output_file="$dest/$(get_backup_file_by_index "$index")"
+    rbd_cli "$RBD_MON_HOSTS" snap create "${RBD_IMAGE}@${CHECKPOINT_NAME}"
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      rbd_cli "$RBD_MON_HOSTS" export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${CHECKPOINT_NAME}" "$output_file"
+    else
+      rbd_cli "$RBD_MON_HOSTS" export "${RBD_IMAGE}@${CHECKPOINT_NAME}" "$output_file"
+    fi
+  done
 }
 
-function usage {
+usage() {
   echo ""
-  echo "Usage: $0 -o <operation> -v|--vm <domain name> -p <backup path> -d <disks path> -q|--quiesce <true|false>"
+  echo "Usage: $0 -o <operation> -v|--vm <domain name> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false>"
   echo ""
   exit 1
 }
 
 while [[ $# -gt 0 ]]; do
   case $1 in
-    -o|--operation)
-      OP="$2"
-      shift
-      shift
-      ;;
-    -v|--vm)
-      VM="$2"
-      shift
-      shift
-      ;;
-    -p|--path)
-      BACKUP_DIR="$2"
-      shift
-      shift
-      ;;
-    -q|--quiesce)
-      QUIESCE="$2"
-      shift
-      shift
-      ;;
-    -d|--diskpaths)
-      DISK_PATHS="$2"
-      shift
-      shift
-      ;;
-    -h|--help)
-      usage
-      shift
-      ;;
-    *)
-      echo "Invalid option: $1"
-      usage
-      ;;
+    -o|--operation) OP="$2"; shift; shift ;;
+    -v|--vm) VM="$2"; shift; shift ;;
+    -p|--path) BACKUP_DIR="$2"; shift; shift ;;
+    -b|--backuptype) BACKUP_TYPE="$2"; shift; shift ;;
+    -c|--checkpoint) CHECKPOINT_NAME="$2"; shift; shift ;;
+    -r|--parentbackup) PARENT_BACKUP_DIR="$2"; shift; shift ;;
+    -i|--parentcheckpoint) PARENT_CHECKPOINT_NAME="$2"; shift; shift ;;
+    -j|--parentcheckpointpath) PARENT_CHECKPOINT_PATH="$2"; shift; shift ;;
+    -f|--backupfiles) BACKUP_FILES="$2"; shift; shift ;;
+    -q|--quiesce) QUIESCE="$2"; shift; shift ;;
+    -d|--diskpaths) DISK_PATHS="$2"; shift; shift ;;
+    -h|--help) usage ;;
+    *) echo "Invalid option: $1"; usage ;;
   esac
 done
 
@@ -235,8 +370,6 @@ if [[ -z "$BACKUP_DIR" ]]; then
 fi
 
 dest="$BACKUP_DIR"
-
-# Perform Initial sanity checks
 sanity_checks
 
 if [[ "$OP" != "backup" ]]; then
@@ -244,8 +377,12 @@ if [[ "$OP" != "backup" ]]; then
   exit 1
 fi
 
-STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
+if [[ "$DISK_PATHS" == rbd:* || "$DISK_PATHS" == *",rbd:"* ]]; then
+  backup_rbd_volumes
+  exit 0
+fi
 
+STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
 if [[ -n "$STATE" && "$STATE" == "running" ]]; then
   backup_running_vm
 else
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 7f4a4b621929..106bf13426c7 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -31,8 +31,15 @@ NAS_TYPE=""
 NAS_ADDRESS=""
 MOUNT_OPTS=""
 BACKUP_DIR=""
+BACKUP_TYPE=""
+CHECKPOINT_NAME=""
+PARENT_BACKUP_DIR=""
+PARENT_CHECKPOINT_NAME=""
+PARENT_CHECKPOINT_PATH=""
+BACKUP_FILES=""
 DISK_PATHS=""
 QUIESCE=""
+DUMMY_VM=""
 logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
@@ -93,15 +100,31 @@ sanity_checks() {
 backup_running_vm() {
   mount_operation
   mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
+  mkdir -p "$dest/checkpoints" || { echo "Failed to create checkpoint directory $dest/checkpoints"; exit 1; }
 
-  name="root"
-  echo "<domainbackup mode='push'><disks>" > $dest/backup.xml
-  for disk in $(virsh -c qemu:///system domblklist $VM --details 2>/dev/null | awk '/disk/{print$3}'); do
-    volpath=$(virsh -c qemu:///system domblklist $VM --details | awk "/$disk/{print $4}" | sed 's/.*\///')
-    echo "<disk name='$disk' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$dest/$name.$volpath.qcow2' /></disk>" >> $dest/backup.xml
-    name="datadisk"
-  done
-  echo "</disks></domainbackup>" >> $dest/backup.xml
+  local parent_checkpoint_file=""
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
+    parent_checkpoint_file="$mount_point/$PARENT_CHECKPOINT_PATH"
+    redefine_checkpoint_if_needed "$VM" "$parent_checkpoint_file"
+  fi
+
+  echo "<domainbackup mode='push'>" > "$dest/backup.xml"
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+    echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$dest/backup.xml"
+  fi
+  echo "<disks>" >> "$dest/backup.xml"
+  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$dest/checkpoint.xml"
+  local index=0
+  while IFS='|' read -r disk target; do
+    [[ -z "$disk" ]] && continue
+    local backup_file
+    backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
+    echo "<disk name='$disk' backup='yes' type='file'><target file='$dest/$backup_file' /><driver type='qcow2'/></disk>" >> "$dest/backup.xml"
+    echo "<disk name='$disk' checkpoint='bitmap'/>" >> "$dest/checkpoint.xml"
+    index=$((index + 1))
+  done < <(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
+  echo "</disks></domainbackup>" >> "$dest/backup.xml"
+  echo "</disks></domaincheckpoint>" >> "$dest/checkpoint.xml"
 
   local thaw=0
   if [[ ${QUIESCE} == "true" ]]; then
@@ -112,7 +135,7 @@ backup_running_vm() {
 
   # Start push backup
   local backup_begin=0
-  if virsh -c qemu:///system backup-begin --domain $VM --backupxml $dest/backup.xml 2>&1 > /dev/null; then
+  if virsh -c qemu:///system backup-begin --domain "$VM" --backupxml "$dest/backup.xml" --checkpointxml "$dest/checkpoint.xml" 2>&1 > /dev/null; then
     backup_begin=1;
   fi
 
@@ -130,13 +153,13 @@ backup_running_vm() {
   fi
 
   # Backup domain information
-  virsh -c qemu:///system dumpxml $VM > $dest/domain-config.xml 2>/dev/null
-  virsh -c qemu:///system dominfo $VM > $dest/dominfo.xml 2>/dev/null
-  virsh -c qemu:///system domiflist $VM > $dest/domiflist.xml 2>/dev/null
-  virsh -c qemu:///system domblklist $VM > $dest/domblklist.xml 2>/dev/null
+  virsh -c qemu:///system dumpxml "$VM" > "$dest/domain-config.xml" 2>/dev/null
+  virsh -c qemu:///system dominfo "$VM" > "$dest/dominfo.xml" 2>/dev/null
+  virsh -c qemu:///system domiflist "$VM" > "$dest/domiflist.xml" 2>/dev/null
+  virsh -c qemu:///system domblklist "$VM" > "$dest/domblklist.xml" 2>/dev/null
 
   while true; do
-    status=$(virsh -c qemu:///system domjobinfo $VM --completed --keep-completed | awk '/Job type:/ {print $3}')
+    status=$(virsh -c qemu:///system domjobinfo "$VM" --completed --keep-completed | awk '/Job type:/ {print $3}')
     case "$status" in
       Completed)
         break ;;
@@ -147,43 +170,143 @@ backup_running_vm() {
     sleep 5
   done
 
-  rm -f $dest/backup.xml
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
+    local index=0
+    while IFS='|' read -r disk target; do
+      [[ -z "$disk" ]] && continue
+      local backup_file
+      backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
+      output="$dest/$backup_file"
+      parent="../$(basename "$PARENT_BACKUP_DIR")/$backup_file"
+      if ! qemu-img rebase -u -F qcow2 -b "$parent" "$output" > "$logFile" 2> >(cat >&2); then
+        echo "qemu-img rebase failed for $output with parent $parent"
+        cleanup
+      fi
+      index=$((index + 1))
+    done < <(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
+  fi
+
+  dump_checkpoint_xml "$VM"
+  rm -f "$dest/backup.xml"
+  rm -f "$dest/checkpoint.xml"
   sync
 
   # Print statistics
-  virsh -c qemu:///system domjobinfo $VM --completed
-  du -sb $dest | cut -f1
+  virsh -c qemu:///system domjobinfo "$VM" --completed
+  du -sb "$dest" | cut -f1
 
-  umount $mount_point
-  rmdir $mount_point
+  umount "$mount_point"
+  rmdir "$mount_point"
 }
 
 backup_stopped_vm() {
+  if echo "$DISK_PATHS" | grep -q '^rbd:'; then
+    backup_rbd_volumes
+    return
+  fi
+
   mount_operation
   mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
+  mkdir -p "$dest/checkpoints" || { echo "Failed to create checkpoint directory $dest/checkpoints"; exit 1; }
 
-  IFS=","
+  local dummy_vm
+  dummy_vm="DUMMY-VM-${CHECKPOINT_NAME//./-}"
+  DUMMY_VM="$dummy_vm"
+  local dummy_xml="$dest/dummy-vm.xml"
+  local checkpoint_xml="$dest/checkpoint.xml"
+  local backup_xml="$dest/backup.xml"
 
-  name="root"
-  for disk in $DISK_PATHS; do
-    if [[ "$disk" == rbd:* ]]; then
-      # disk for rbd => rbd:<pool>/<uuid>:mon_host=<monitor_host>...
-      # sample: rbd:cloudstack/53d5c355-d726-4d3e-9422-046a503a0b12:mon_host=10.0.1.2...
-      beforeUuid="${disk#*/}"     # Remove up to first slash after rbd:
-      volUuid="${beforeUuid%%:*}" # Remove everything after colon to get the uuid
-    else
-      volUuid="${disk##*/}"
-    fi
-    output="$dest/$name.$volUuid.qcow2"
-    if ! qemu-img convert -O qcow2 "$disk" "$output" > "$logFile" 2> >(cat >&2); then
-      echo "qemu-img convert failed for $disk $output"
-      cleanup
-    fi
-    name="datadisk"
+  create_dummy_vm_xml "$dummy_vm" "$dummy_xml"
+  virsh -c qemu:///system define "$dummy_xml" > /dev/null
+  virsh -c qemu:///system start "$dummy_vm" --paused > /dev/null
+
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
+    redefine_checkpoint_if_needed "$dummy_vm" "$mount_point/$PARENT_CHECKPOINT_PATH"
+  fi
+
+  create_backup_xml_for_dummy_vm "$dummy_vm" "$backup_xml" "$checkpoint_xml"
+
+  if ! virsh -c qemu:///system backup-begin --domain "$dummy_vm" --backupxml "$backup_xml" --checkpointxml "$checkpoint_xml" > /dev/null 2>&1; then
+    echo "Failed to start backup for dummy VM $dummy_vm"
+    cleanup
+  fi
+
+  while true; do
+    status=$(virsh -c qemu:///system domjobinfo "$dummy_vm" --completed --keep-completed | awk '/Job type:/ {print $3}')
+    case "$status" in
+      Completed)
+        break ;;
+      Failed)
+        echo "Virsh backup job failed for dummy VM $dummy_vm"
+        cleanup ;;
+    esac
+    sleep 5
   done
+
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
+    local index=0
+    while IFS= read -r disk; do
+      [[ -z "$disk" ]] && continue
+      local backup_file
+      backup_file=$(get_backup_file_by_index "$index" "$(basename "$disk").qcow2")
+      output="$dest/$backup_file"
+      parent="../$(basename "$PARENT_BACKUP_DIR")/$backup_file"
+      if ! qemu-img rebase -u -F qcow2 -b "$parent" "$output" > "$logFile" 2> >(cat >&2); then
+        echo "qemu-img rebase failed for $output with parent $parent"
+        cleanup
+      fi
+      index=$((index + 1))
+    done < <(split_csv "$DISK_PATHS")
+  fi
+
+  dump_checkpoint_xml "$dummy_vm"
+  cleanup_dummy_vm
+  DUMMY_VM=""
+  rm -f "$backup_xml" "$checkpoint_xml" "$dummy_xml"
   sync
 
-  ls -l --numeric-uid-gid $dest | awk '{print $5}'
+  find "$dest" -maxdepth 1 -type f -printf '%s\n'
+  umount "$mount_point"
+  rmdir "$mount_point"
+}
+
+backup_rbd_volumes() {
+  mount_operation
+  mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
+
+  local index=0
+  while IFS= read -r disk; do
+    [[ -z "$disk" ]] && continue
+    parse_rbd_uri "$disk"
+    local backup_file
+    backup_file=$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")
+    local output="$dest/$backup_file"
+    local current_snapshot="${CHECKPOINT_NAME}"
+
+    if ! rbd_cli snap create "${RBD_IMAGE}@${current_snapshot}" > /dev/null 2>&1; then
+      echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
+      cleanup
+    fi
+
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      if ! rbd_cli export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" > /dev/null 2>&1; then
+        echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${current_snapshot}"
+        cleanup
+      fi
+    else
+      if ! rbd_cli export "${RBD_IMAGE}@${current_snapshot}" "$output" > /dev/null 2>&1; then
+        echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
+        cleanup
+      fi
+    fi
+
+    stat -c %s "$output"
+    index=$((index + 1))
+  done < <(split_csv "$DISK_PATHS")
+
+  sync
+  umount "$mount_point"
+  rmdir "$mount_point"
 }
 
 delete_backup() {
@@ -222,6 +345,7 @@ mount_operation() {
 cleanup() {
   local status=0
 
+  cleanup_dummy_vm
   rm -rf "$dest" || { echo "Failed to delete $dest"; status=1; }
   umount "$mount_point" || { echo "Failed to unmount $mount_point"; status=1; }
   rmdir "$mount_point" || { echo "Failed to remove mount point $mount_point"; status=1; }
@@ -232,9 +356,177 @@ cleanup() {
   fi
 }
 
+cleanup_dummy_vm() {
+  if [[ -n "$DUMMY_VM" ]]; then
+    virsh -c qemu:///system destroy "$DUMMY_VM" > /dev/null 2>&1 || true
+    virsh -c qemu:///system undefine "$DUMMY_VM" --nvram > /dev/null 2>&1 || virsh -c qemu:///system undefine "$DUMMY_VM" > /dev/null 2>&1 || true
+  fi
+}
+
+split_csv() {
+  tr ',' '\n' <<< "$1"
+}
+
+get_backup_file_by_index() {
+  local index="$1"
+  local fallback="$2"
+  if [[ -z "$BACKUP_FILES" ]]; then
+    echo "$fallback"
+    return
+  fi
+  local current=0
+  while IFS= read -r value; do
+    if [[ "$current" -eq "$index" ]]; then
+      echo "$value"
+      return
+    fi
+    current=$((current + 1))
+  done < <(split_csv "$BACKUP_FILES")
+  echo "$fallback"
+}
+
+dump_checkpoint_xml() {
+  local vm_name="$1"
+  if [[ -n "$CHECKPOINT_NAME" ]]; then
+    virsh -c qemu:///system checkpoint-dumpxml --domain "$vm_name" --checkpointname "$CHECKPOINT_NAME" --no-domain > "$dest/checkpoints/$CHECKPOINT_NAME.xml" 2>/dev/null || true
+  fi
+}
+
+redefine_checkpoint_if_needed() {
+  local vm_name="$1"
+  local checkpoint_file="$2"
+  if [[ -z "$PARENT_CHECKPOINT_NAME" || -z "$checkpoint_file" || ! -f "$checkpoint_file" ]]; then
+    return
+  fi
+  if virsh -c qemu:///system checkpoint-info --domain "$vm_name" --checkpointname "$PARENT_CHECKPOINT_NAME" > /dev/null 2>&1; then
+    return
+  fi
+  if ! virsh -c qemu:///system checkpoint-create --domain "$vm_name" --xmlfile "$checkpoint_file" --redefine > /dev/null 2>&1; then
+    echo "Failed to redefine checkpoint $PARENT_CHECKPOINT_NAME on domain $vm_name"
+    cleanup
+  fi
+}
+
+create_dummy_vm_xml() {
+  local vm_name="$1"
+  local output_file="$2"
+  local arch
+  local emulator
+  local machine="pc"
+  arch="$(uname -m)"
+  [[ "$arch" == "aarch64" ]] && machine="virt"
+  emulator="$(command -v qemu-system-${arch})"
+  if [[ -z "$emulator" ]]; then
+    emulator="$(command -v qemu-kvm)"
+  fi
+  if [[ -z "$emulator" ]]; then
+    echo "Unable to find qemu emulator path"
+    cleanup
+  fi
+
+  {
+    echo "<domain type='qemu'>"
+    echo "  <name>${vm_name}</name>"
+    echo "  <memory unit='MiB'>128</memory>"
+    echo "  <vcpu>1</vcpu>"
+    echo "  <os>"
+    echo "    <type arch='${arch}' machine='${machine}'>hvm</type>"
+    echo "  </os>"
+    echo "  <devices>"
+    echo "    <emulator>${emulator}</emulator>"
+    local index=0
+    while IFS= read -r disk; do
+      [[ -z "$disk" ]] && continue
+      local letter
+      letter=$(printf "\\$(printf '%03o' $((97 + index)))")
+      echo "    <disk type='file' device='disk'>"
+      echo "      <source file='${disk}'/>"
+      echo "      <target dev='vd${letter}' bus='virtio'/>"
+      echo "    </disk>"
+      index=$((index + 1))
+    done < <(split_csv "$DISK_PATHS")
+    echo "  </devices>"
+    echo "</domain>"
+  } > "$output_file"
+}
+
+create_backup_xml_for_dummy_vm() {
+  local vm_name="$1"
+  local backup_xml="$2"
+  local checkpoint_xml="$3"
+
+  echo "<domainbackup mode='push'>" > "$backup_xml"
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+    echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$backup_xml"
+  fi
+  echo "<disks>" >> "$backup_xml"
+  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$checkpoint_xml"
+
+  local index=0
+  while IFS='|' read -r disk target; do
+    [[ -z "$disk" ]] && continue
+    local backup_file
+    backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
+    echo "<disk name='$disk' backup='yes' type='file'><target file='$dest/$backup_file' /><driver type='qcow2'/></disk>" >> "$backup_xml"
+    echo "<disk name='$disk' checkpoint='bitmap'/>" >> "$checkpoint_xml"
+    index=$((index + 1))
+  done < <(virsh -c qemu:///system domblklist "$vm_name" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
+
+  echo "</disks></domainbackup>" >> "$backup_xml"
+  echo "</disks></domaincheckpoint>" >> "$checkpoint_xml"
+}
+
+parse_rbd_uri() {
+  local uri="$1"
+  RBD_IMAGE="${uri#rbd:}"
+  RBD_IMAGE="${RBD_IMAGE%%:*}"
+  RBD_MON_HOST=""
+  RBD_USER=""
+  RBD_KEY=""
+
+  local remainder="${uri#rbd:${RBD_IMAGE}}"
+  while [[ -n "$remainder" ]]; do
+    remainder="${remainder#:}"
+    [[ -z "$remainder" ]] && break
+    local token="${remainder%%:*}"
+    if [[ "$remainder" == "$token" ]]; then
+      remainder=""
+    else
+      remainder="${remainder#${token}}"
+    fi
+    case "$token" in
+      mon_host=*)
+        RBD_MON_HOST="${token#mon_host=}"
+        RBD_MON_HOST="${RBD_MON_HOST//\\;/,}"
+        RBD_MON_HOST="${RBD_MON_HOST//\\:/:}"
+        ;;
+      id=*)
+        RBD_USER="${token#id=}"
+        ;;
+      key=*)
+        RBD_KEY="${token#key=}"
+        ;;
+    esac
+  done
+}
+
+rbd_cli() {
+  local cmd=(rbd)
+  if [[ -n "$RBD_MON_HOST" ]]; then
+    cmd+=(-m "$RBD_MON_HOST")
+  fi
+  if [[ -n "$RBD_USER" ]]; then
+    cmd+=(--id "$RBD_USER")
+  fi
+  if [[ -n "$RBD_KEY" ]]; then
+    cmd+=(--key "$RBD_KEY")
+  fi
+  "${cmd[@]}" "$@"
+}
+
 function usage {
   echo ""
-  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -d <disks path> -q|--quiesce <true|false>"
+  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false>"
   echo ""
   exit 1
 }
@@ -271,6 +563,36 @@ while [[ $# -gt 0 ]]; do
       shift
       shift
       ;;
+    -b|--backuptype)
+      BACKUP_TYPE="$2"
+      shift
+      shift
+      ;;
+    -c|--checkpoint)
+      CHECKPOINT_NAME="$2"
+      shift
+      shift
+      ;;
+    -r|--parentpath)
+      PARENT_BACKUP_DIR="$2"
+      shift
+      shift
+      ;;
+    -i|--parentcheckpoint)
+      PARENT_CHECKPOINT_NAME="$2"
+      shift
+      shift
+      ;;
+    -j|--parentcheckpointpath)
+      PARENT_CHECKPOINT_PATH="$2"
+      shift
+      shift
+      ;;
+    -f|--backupfiles)
+      BACKUP_FILES="$2"
+      shift
+      shift
+      ;;
     -q|--quiesce)
       QUIESCE="$2"
       shift
@@ -296,11 +618,15 @@ done
 sanity_checks
 
 if [ "$OP" = "backup" ]; then
-  STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
-  if [ -n "$STATE" ] && [ "$STATE" = "running" ]; then
-    backup_running_vm
+  if echo "$DISK_PATHS" | grep -q '^rbd:'; then
+    backup_rbd_volumes
   else
-    backup_stopped_vm
+    STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
+    if [ -n "$STATE" ] && [ "$STATE" = "running" ]; then
+      backup_running_vm
+    else
+      backup_stopped_vm
+    fi
   fi
 elif [ "$OP" = "delete" ]; then
   delete_backup
diff --git a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
index 37552192814c..07d03a91710b 100644
--- a/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
+++ b/server/src/main/java/com/cloud/template/HypervisorTemplateAdapter.java
@@ -53,7 +53,9 @@
 import org.apache.cloudstack.framework.async.AsyncRpcContext;
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.framework.messagebus.PublishScope;
+import org.apache.cloudstack.secstorage.heuristics.HeuristicType;
 import org.apache.cloudstack.storage.command.TemplateOrVolumePostUploadCommand;
+import org.apache.cloudstack.storage.datastore.db.ImageStoreVO;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
 import org.apache.cloudstack.storage.image.datastore.ImageStoreEntity;
@@ -323,6 +325,15 @@ protected DataStore verifyHeuristicRulesForZone(VMTemplateVO template, Long zone
         return null;
     }
 
+    protected boolean isWritableImageStore(DataStore imageStore, Long zoneId) {
+        ImageStoreVO imageStoreVO = _imgStoreDao.findById(imageStore.getId());
+        if (imageStoreVO == null) {
+            logger.warn("Unable to find image store [{}] in zone [{}] while validating heuristic rule selection.", imageStore, zoneId);
+            return false;
+        }
+        return !imageStoreVO.isReadonly();
+    }
+
     protected void standardImageStoreAllocation(List<DataStore> imageStores, VMTemplateVO template) {
         Set<Long> zoneSet = new HashSet<Long>();
         Collections.shuffle(imageStores);
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index bc25f083e1b5..3bff33ef9a97 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1856,6 +1856,7 @@ public ConfigKey<?>[] getConfigKeys() {
                 BackupProviderPlugin,
                 BackupSyncPollingInterval,
                 BackupEnableAttachDetachVolumes,
+                KvmIncrementalBackup,
                 DefaultMaxAccountBackups,
                 DefaultMaxAccountBackupStorage,
                 DefaultMaxProjectBackups,

From 296ee63fc0d2d0d523789df776cf16faf44b6fce Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 09:51:14 +0900
Subject: [PATCH 16/93] Update FormSchedule.vue

---
 ui/src/views/compute/backup/FormSchedule.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui/src/views/compute/backup/FormSchedule.vue b/ui/src/views/compute/backup/FormSchedule.vue
index 7ed01551795d..8b1817ba4964 100644
--- a/ui/src/views/compute/backup/FormSchedule.vue
+++ b/ui/src/views/compute/backup/FormSchedule.vue
@@ -266,7 +266,6 @@ export default {
     initForm () {
       this.formRef = ref()
       this.form = reactive({
-        intervaltype: 'hourly',
         intervaltype: 'hourly',
         time: null,
         timeSelect: null,

From e249dfe402194c2a987873e75a6363c7d1ded977 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 13:49:45 +0900
Subject: [PATCH 17/93] =?UTF-8?q?vm=5Fid=20=EC=BB=AC=EB=9F=BC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/META-INF/db/schema-42100to42200.sql | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql b/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql
index 97c223dda2d7..a3209a605e81 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-42100to42200.sql
@@ -41,6 +41,13 @@ CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.ldap_configuration', 'uuid', 'VARCHA
 -- Populate uuid for existing rows where uuid is NULL or empty
 UPDATE `cloud`.`ldap_configuration` SET uuid = UUID() WHERE uuid IS NULL OR uuid = '';
 
+-- Add vm_id column to usage_event table for volume usage events
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.usage_event','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with volume usage events"');
+CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_event','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with volume usage events"');
+
+-- Add vm_id column to cloud_usage.usage_volume table
+CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_volume','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with the volume usage"');
+
 -- Add the column cross_zone_instance_creation to cloud.backup_repository. if enabled it means that new Instance can be created on all Zones from Backups on this Repository.
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_repository', 'cross_zone_instance_creation', 'TINYINT(1) DEFAULT NULL COMMENT ''Backup Repository can be used for disaster recovery on another zone''');
 

From 0982a5a532f9655d838aa2de2d70d375a3644e84 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 14:07:58 +0900
Subject: [PATCH 18/93] =?UTF-8?q?nasbackup.sh=20=ED=8C=8C=EC=9D=BC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 106bf13426c7..88bf2b499a4d 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -200,7 +200,7 @@ backup_running_vm() {
 }
 
 backup_stopped_vm() {
-  if echo "$DISK_PATHS" | grep -q '^rbd:'; then
+  if is_rbd_disk_path "$DISK_PATHS"; then
     backup_rbd_volumes
     return
   fi
@@ -278,23 +278,34 @@ backup_rbd_volumes() {
   while IFS= read -r disk; do
     [[ -z "$disk" ]] && continue
     parse_rbd_uri "$disk"
+    if [[ -z "$RBD_IMAGE" ]]; then
+      echo "Unable to parse RBD disk path: $disk"
+      cleanup
+    fi
+
     local backup_file
     backup_file=$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")
     local output="$dest/$backup_file"
     local current_snapshot="${CHECKPOINT_NAME}"
 
-    if ! rbd_cli snap create "${RBD_IMAGE}@${current_snapshot}" > /dev/null 2>&1; then
+    log -ne "Starting RBD backup for disk path [$disk], resolved image [$RBD_IMAGE], output [$output]"
+    if ! rbd_cli info "$RBD_IMAGE" >> "$logFile" 2>&1; then
+      echo "Failed to access RBD image $RBD_IMAGE"
+      cleanup
+    fi
+
+    if ! rbd_cli snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
       echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
       cleanup
     fi
 
     if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      if ! rbd_cli export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" > /dev/null 2>&1; then
+      if ! rbd_cli export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
         echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${current_snapshot}"
         cleanup
       fi
     else
-      if ! rbd_cli export "${RBD_IMAGE}@${current_snapshot}" "$output" > /dev/null 2>&1; then
+      if ! rbd_cli export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
         echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
         cleanup
       fi
@@ -367,6 +378,11 @@ split_csv() {
   tr ',' '\n' <<< "$1"
 }
 
+is_rbd_disk_path() {
+  local disk_path="$1"
+  [[ "$disk_path" == rbd:* || "$disk_path" == rbd/* ]]
+}
+
 get_backup_file_by_index() {
   local index="$1"
   local fallback="$2"
@@ -618,7 +634,7 @@ done
 sanity_checks
 
 if [ "$OP" = "backup" ]; then
-  if echo "$DISK_PATHS" | grep -q '^rbd:'; then
+  if is_rbd_disk_path "$DISK_PATHS"; then
     backup_rbd_volumes
   else
     STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')

From 6dff42697d692ee53188ef608d8e07ef8c5e9470 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 14:15:26 +0900
Subject: [PATCH 19/93] Update BackupManager.java

---
 .../main/java/org/apache/cloudstack/backup/BackupManager.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
index de930c96aa0a..0c83f53ccf0a 100644
--- a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
@@ -73,7 +73,7 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             "false",
             "Enable KVM incremental backups for supported backup providers.",
             false,
-            ConfigKey.Scope.Zone,
+            ConfigKey.Scope.Cluster,
             null);
 
     ConfigKey<Long> DefaultMaxAccountBackups = new ConfigKey<Long>("Account Defaults", Long.class,

From 4b445f0cabc7518a16d805a47980e717269bcf5c Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 14:45:14 +0900
Subject: [PATCH 20/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 88bf2b499a4d..d856ed3dd792 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -271,13 +271,16 @@ backup_stopped_vm() {
 }
 
 backup_rbd_volumes() {
+  log -ne "Entered backup_rbd_volumes with DISK_PATHS=[$DISK_PATHS], BACKUP_FILES=[$BACKUP_FILES], BACKUP_DIR=[$BACKUP_DIR]"
   mount_operation
   mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
 
   local index=0
   while IFS= read -r disk; do
+    log -ne "Loop disk raw value=[$disk]"
     [[ -z "$disk" ]] && continue
     parse_rbd_uri "$disk"
+    log -ne "Parsed disk [$disk] -> RBD_IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
     if [[ -z "$RBD_IMAGE" ]]; then
       echo "Unable to parse RBD disk path: $disk"
       cleanup
@@ -494,6 +497,7 @@ create_backup_xml_for_dummy_vm() {
 
 parse_rbd_uri() {
   local uri="$1"
+  log -ne "parse_rbd_uri called with uri=[$uri]"
   RBD_IMAGE="${uri#rbd:}"
   RBD_IMAGE="${RBD_IMAGE%%:*}"
   RBD_MON_HOST=""

From f35c1f6de38f79fc93cd7710be4fe09c2458d990 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 15:02:55 +0900
Subject: [PATCH 21/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 77 ++++++++++++++++----------
 1 file changed, 48 insertions(+), 29 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index d856ed3dd792..5020d7892de8 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -277,10 +277,13 @@ backup_rbd_volumes() {
 
   local index=0
   while IFS= read -r disk; do
+    local created_snapshot=""
     log -ne "Loop disk raw value=[$disk]"
     [[ -z "$disk" ]] && continue
+
     parse_rbd_uri "$disk"
     log -ne "Parsed disk [$disk] -> RBD_IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
+
     if [[ -z "$RBD_IMAGE" ]]; then
       echo "Unable to parse RBD disk path: $disk"
       cleanup
@@ -291,34 +294,41 @@ backup_rbd_volumes() {
     local output="$dest/$backup_file"
     local current_snapshot="${CHECKPOINT_NAME}"
 
+    log -ne "Resolved backup file [$backup_file], destination [$output]"
     log -ne "Starting RBD backup for disk path [$disk], resolved image [$RBD_IMAGE], output [$output]"
-    if ! rbd_cli info "$RBD_IMAGE" >> "$logFile" 2>&1; then
+
+    if ! timeout 30s rbd_cli info "$RBD_IMAGE" >> "$logFile" 2>&1; then
       echo "Failed to access RBD image $RBD_IMAGE"
       cleanup
     fi
 
-    if ! rbd_cli snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
+    if ! timeout 30s rbd_cli snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
       echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
       cleanup
     fi
+    created_snapshot="${RBD_IMAGE}@${current_snapshot}"
 
     if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      if ! rbd_cli export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
+      if ! timeout 6h rbd_cli export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
         echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${current_snapshot}"
+        [[ -n "$created_snapshot" ]] && rbd_cli snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
         cleanup
       fi
     else
-      if ! rbd_cli export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
+      if ! timeout 6h rbd_cli export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
         echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
+        [[ -n "$created_snapshot" ]] && rbd_cli snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
         cleanup
       fi
     fi
 
+    log -ne "Finished exporting backup file [$output] size=[$(stat -c %s "$output" 2>/dev/null)]"
     stat -c %s "$output"
     index=$((index + 1))
   done < <(split_csv "$DISK_PATHS")
 
   sync
+  log -ne "RBD backup completed for BACKUP_DIR=[$BACKUP_DIR]"
   umount "$mount_point"
   rmdir "$mount_point"
 }
@@ -498,40 +508,47 @@ create_backup_xml_for_dummy_vm() {
 parse_rbd_uri() {
   local uri="$1"
   log -ne "parse_rbd_uri called with uri=[$uri]"
-  RBD_IMAGE="${uri#rbd:}"
-  RBD_IMAGE="${RBD_IMAGE%%:*}"
+
+  RBD_IMAGE=""
   RBD_MON_HOST=""
   RBD_USER=""
   RBD_KEY=""
 
-  local remainder="${uri#rbd:${RBD_IMAGE}}"
-  while [[ -n "$remainder" ]]; do
-    remainder="${remainder#:}"
-    [[ -z "$remainder" ]] && break
-    local token="${remainder%%:*}"
-    if [[ "$remainder" == "$token" ]]; then
-      remainder=""
-    else
-      remainder="${remainder#${token}}"
+  if [[ "$uri" == rbd:* ]]; then
+    local payload="${uri#rbd:}"
+    RBD_IMAGE="${payload%%:*}"
+
+    if [[ "$uri" =~ :mon_host=([^:]*) ]]; then
+      RBD_MON_HOST="${BASH_REMATCH[1]}"
+      RBD_MON_HOST="${RBD_MON_HOST//\\;/,}"
+      RBD_MON_HOST="${RBD_MON_HOST//\\:/:}"
     fi
-    case "$token" in
-      mon_host=*)
-        RBD_MON_HOST="${token#mon_host=}"
-        RBD_MON_HOST="${RBD_MON_HOST//\\;/,}"
-        RBD_MON_HOST="${RBD_MON_HOST//\\:/:}"
-        ;;
-      id=*)
-        RBD_USER="${token#id=}"
-        ;;
-      key=*)
-        RBD_KEY="${token#key=}"
-        ;;
-    esac
-  done
+
+    if [[ "$uri" =~ :id=([^:]*) ]]; then
+      RBD_USER="${BASH_REMATCH[1]}"
+    fi
+
+    if [[ "$uri" =~ :key=([^:]*) ]]; then
+      RBD_KEY="${BASH_REMATCH[1]}"
+    fi
+  elif [[ "$uri" == rbd/* ]]; then
+    RBD_IMAGE="$uri"
+  else
+    echo "Invalid RBD disk path: $uri"
+    cleanup
+  fi
+
+  if [[ -z "$RBD_IMAGE" ]]; then
+    echo "Failed to parse RBD image from uri: $uri"
+    cleanup
+  fi
+
+  log -ne "Parsed RBD uri -> IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
 }
 
 rbd_cli() {
   local cmd=(rbd)
+
   if [[ -n "$RBD_MON_HOST" ]]; then
     cmd+=(-m "$RBD_MON_HOST")
   fi
@@ -541,6 +558,8 @@ rbd_cli() {
   if [[ -n "$RBD_KEY" ]]; then
     cmd+=(--key "$RBD_KEY")
   fi
+
+  log -ne "Executing RBD command: ${cmd[*]} $*"
   "${cmd[@]}" "$@"
 }
 

From a05c3c088d2c968ac179458b1d39683830851ef5 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 15:10:59 +0900
Subject: [PATCH 22/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 33 +++++++++++++-------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 5020d7892de8..a1020d5ba152 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -289,6 +289,9 @@ backup_rbd_volumes() {
       cleanup
     fi
 
+    build_rbd_cmd
+    log -ne "Built RBD command: ${RBD_CMD[*]}"
+
     local backup_file
     backup_file=$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")
     local output="$dest/$backup_file"
@@ -297,27 +300,27 @@ backup_rbd_volumes() {
     log -ne "Resolved backup file [$backup_file], destination [$output]"
     log -ne "Starting RBD backup for disk path [$disk], resolved image [$RBD_IMAGE], output [$output]"
 
-    if ! timeout 30s rbd_cli info "$RBD_IMAGE" >> "$logFile" 2>&1; then
+    if ! timeout 30s "${RBD_CMD[@]}" info "$RBD_IMAGE" >> "$logFile" 2>&1; then
       echo "Failed to access RBD image $RBD_IMAGE"
       cleanup
     fi
 
-    if ! timeout 30s rbd_cli snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
+    if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
       echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
       cleanup
     fi
     created_snapshot="${RBD_IMAGE}@${current_snapshot}"
 
     if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      if ! timeout 6h rbd_cli export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
+      if ! timeout 6h "${RBD_CMD[@]}" export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
         echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${current_snapshot}"
-        [[ -n "$created_snapshot" ]] && rbd_cli snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
+        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
         cleanup
       fi
     else
-      if ! timeout 6h rbd_cli export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
+      if ! timeout 6h "${RBD_CMD[@]}" export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
         echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
-        [[ -n "$created_snapshot" ]] && rbd_cli snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
+        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
         cleanup
       fi
     fi
@@ -329,8 +332,8 @@ backup_rbd_volumes() {
 
   sync
   log -ne "RBD backup completed for BACKUP_DIR=[$BACKUP_DIR]"
-  umount "$mount_point"
-  rmdir "$mount_point"
+  umount "$mount_point" || { echo "Failed to unmount $mount_point"; exit 1; }
+  rmdir "$mount_point" || { echo "Failed to remove mount point $mount_point"; exit 1; }
 }
 
 delete_backup() {
@@ -546,21 +549,17 @@ parse_rbd_uri() {
   log -ne "Parsed RBD uri -> IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
 }
 
-rbd_cli() {
-  local cmd=(rbd)
-
+build_rbd_cmd() {
+  RBD_CMD=(rbd)
   if [[ -n "$RBD_MON_HOST" ]]; then
-    cmd+=(-m "$RBD_MON_HOST")
+    RBD_CMD+=(-m "$RBD_MON_HOST")
   fi
   if [[ -n "$RBD_USER" ]]; then
-    cmd+=(--id "$RBD_USER")
+    RBD_CMD+=(--id "$RBD_USER")
   fi
   if [[ -n "$RBD_KEY" ]]; then
-    cmd+=(--key "$RBD_KEY")
+    RBD_CMD+=(--key "$RBD_KEY")
   fi
-
-  log -ne "Executing RBD command: ${cmd[*]} $*"
-  "${cmd[@]}" "$@"
 }
 
 function usage {

From 0908acd70732c5709dd4179169966124186436a8 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 15:22:43 +0900
Subject: [PATCH 23/93] =?UTF-8?q?rbd=EC=9D=98=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=EC=97=90=EB=8F=84=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EB=B0=B1=EC=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 40 ++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 5 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index a1020d5ba152..1eaa1b1ba80c 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -152,11 +152,7 @@ backup_running_vm() {
     exit 1
   fi
 
-  # Backup domain information
-  virsh -c qemu:///system dumpxml "$VM" > "$dest/domain-config.xml" 2>/dev/null
-  virsh -c qemu:///system dominfo "$VM" > "$dest/dominfo.xml" 2>/dev/null
-  virsh -c qemu:///system domiflist "$VM" > "$dest/domiflist.xml" 2>/dev/null
-  virsh -c qemu:///system domblklist "$VM" > "$dest/domblklist.xml" 2>/dev/null
+  backup_domain_information "$VM"
 
   while true; do
     status=$(virsh -c qemu:///system domjobinfo "$VM" --completed --keep-completed | awk '/Job type:/ {print $3}')
@@ -275,6 +271,8 @@ backup_rbd_volumes() {
   mount_operation
   mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
 
+  backup_domain_information "$VM"
+
   local index=0
   while IFS= read -r disk; do
     local created_snapshot=""
@@ -336,6 +334,38 @@ backup_rbd_volumes() {
   rmdir "$mount_point" || { echo "Failed to remove mount point $mount_point"; exit 1; }
 }
 
+backup_domain_information() {
+  local vm_name="$1"
+
+  [[ -z "$vm_name" ]] && return 0
+
+  mkdir -p "$dest/checkpoints" || {
+    echo "Failed to create checkpoint directory $dest/checkpoints"
+    exit 1
+  }
+
+  if virsh -c qemu:///system dominfo "$vm_name" > /dev/null 2>&1; then
+    virsh -c qemu:///system dumpxml "$vm_name" > "$dest/domain-config.xml" 2>/dev/null || true
+    virsh -c qemu:///system dominfo "$vm_name" > "$dest/dominfo.xml" 2>/dev/null || true
+    virsh -c qemu:///system domiflist "$vm_name" > "$dest/domiflist.xml" 2>/dev/null || true
+    virsh -c qemu:///system domblklist "$vm_name" > "$dest/domblklist.xml" 2>/dev/null || true
+
+    if [[ -n "$CHECKPOINT_NAME" ]]; then
+      cat > "$dest/checkpoints/$CHECKPOINT_NAME.meta" <<EOF
+checkpoint_name=$CHECKPOINT_NAME
+backup_type=$BACKUP_TYPE
+vm_name=$vm_name
+disk_paths=$DISK_PATHS
+backup_files=$BACKUP_FILES
+EOF
+    fi
+
+    log -ne "Backed up domain information for VM [$vm_name]"
+  else
+    log -ne "VM [$vm_name] not found in libvirt; skipped domain metadata backup"
+  fi
+}
+
 delete_backup() {
   mount_operation
 

From 95e51b8ce18aee0e4176e68ae47b4bc025d26e18 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 15:34:59 +0900
Subject: [PATCH 24/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 72 ++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 3 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 1eaa1b1ba80c..56f5f3f96898 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -328,10 +328,12 @@ backup_rbd_volumes() {
     index=$((index + 1))
   done < <(split_csv "$DISK_PATHS")
 
+  write_rbd_backup_metadata "$BACKUP_TYPE" "$CHECKPOINT_NAME" "$PARENT_CHECKPOINT_NAME"
+
   sync
-  log -ne "RBD backup completed for BACKUP_DIR=[$BACKUP_DIR]"
-  umount "$mount_point" || { echo "Failed to unmount $mount_point"; exit 1; }
-  rmdir "$mount_point" || { echo "Failed to remove mount point $mount_point"; exit 1; }
+  log -ne "RBD backup completed checkpoint=[$CHECKPOINT_NAME] parent=[$PARENT_CHECKPOINT_NAME]"
+  umount "$mount_point"
+  rmdir "$mount_point"
 }
 
 backup_domain_information() {
@@ -366,9 +368,55 @@ EOF
   fi
 }
 
+has_child_backup() {
+  local checkpoint_name="$1"
+
+  [[ -z "$checkpoint_name" ]] && return 1
+
+  grep -R -q "^parent_checkpoint_name=$checkpoint_name$" "$mount_point"/*/rbd-backup.meta 2>/dev/null
+}
+
+delete_rbd_snapshot_if_unreferenced() {
+  local disk_paths="$1"
+  local checkpoint_name="$2"
+
+  [[ -z "$checkpoint_name" ]] && return 0
+
+  if has_child_backup "$checkpoint_name"; then
+    log -ne "Skip snapshot delete [$checkpoint_name] (child exists)"
+    return 0
+  fi
+
+  while IFS= read -r disk; do
+    [[ -z "$disk" ]] && continue
+    parse_rbd_uri "$disk"
+    build_rbd_cmd
+
+    if [[ -n "$RBD_IMAGE" ]]; then
+      log -ne "Deleting snapshot [${RBD_IMAGE}@${checkpoint_name}]"
+      "${RBD_CMD[@]}" snap rm "${RBD_IMAGE}@${checkpoint_name}" >> "$logFile" 2>&1 || true
+    fi
+  done < <(split_csv "$disk_paths")
+}
+
 delete_backup() {
   mount_operation
 
+  if [[ -f "$dest/rbd-backup.meta" ]]; then
+    source "$dest/rbd-backup.meta"
+
+    log -ne "Deleting backup with metadata [$dest]"
+
+    if has_child_backup "$checkpoint_name"; then
+      echo "Cannot delete backup [$backup_dir]: child backup exists"
+      umount "$mount_point"
+      rmdir "$mount_point"
+      exit 1
+    fi
+
+    delete_rbd_snapshot_if_unreferenced "$disk_paths" "$checkpoint_name"
+  fi
+
   rm -frv $dest
   sync
   umount $mount_point
@@ -592,6 +640,24 @@ build_rbd_cmd() {
   fi
 }
 
+write_rbd_backup_metadata() {
+  local backup_type="$1"
+  local checkpoint_name="$2"
+  local parent_checkpoint_name="$3"
+
+  cat > "$dest/rbd-backup.meta" <<EOF
+vm_name=$VM
+backup_type=$backup_type
+checkpoint_name=$checkpoint_name
+parent_checkpoint_name=$parent_checkpoint_name
+disk_paths=$DISK_PATHS
+backup_files=$BACKUP_FILES
+backup_dir=$BACKUP_DIR
+EOF
+
+  log -ne "Wrote RBD backup metadata to [$dest/rbd-backup.meta]"
+}
+
 function usage {
   echo ""
   echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false>"

From 670541ece64dc65cc061ab48db972bfcd1f75908 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 16:01:31 +0900
Subject: [PATCH 25/93] =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/DeleteBackupCommand.java           |  12 +-
 .../cloudstack/backup/NASBackupProvider.java  |   2 +-
 .../backup/NASBackupProviderTest.java         |   5 +-
 ...tCommvaultRestoreBackupCommandWrapper.java |   2 +-
 .../LibvirtDeleteBackupCommandWrapper.java    |   4 +-
 .../LibvirtRestoreBackupCommandWrapper.java   |  13 +-
 scripts/vm/hypervisor/kvm/cvtbackup.sh        | 153 ++++++++++++++----
 scripts/vm/hypervisor/kvm/nasbackup.sh        |  10 +-
 8 files changed, 157 insertions(+), 44 deletions(-)

diff --git a/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
index 16c611af998e..2b173fd2fdec 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
@@ -26,15 +26,17 @@ public class DeleteBackupCommand extends Command {
     private String backupPath;
     private String backupRepoType;
     private String backupRepoAddress;
+    private boolean forced;
     @LogLevel(LogLevel.Log4jLevel.Off)
     private String mountOptions;
 
-    public DeleteBackupCommand(String backupPath, String backupRepoType, String backupRepoAddress, String mountOptions) {
+    public DeleteBackupCommand(String backupPath, String backupRepoType, String backupRepoAddress, String mountOptions, boolean forced) {
         super();
         this.backupPath = backupPath;
         this.backupRepoType = backupRepoType;
         this.backupRepoAddress = backupRepoAddress;
         this.mountOptions = mountOptions;
+        this.forced = forced;
     }
 
     public String getBackupPath() {
@@ -69,6 +71,14 @@ public void setMountOptions(String mountOptions) {
         this.mountOptions = mountOptions;
     }
 
+    public boolean isForced() {
+        return forced;
+    }
+
+    public void setForced(boolean forced) {
+        this.forced = forced;
+    }
+
     @Override
     public boolean executeInSequence() {
         return true;
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 7a1d6e10620e..429cd36aba2d 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -725,7 +725,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
         }
 
         DeleteBackupCommand command = new DeleteBackupCommand(backup.getExternalId(), backupRepository.getType(),
-                backupRepository.getAddress(), backupRepository.getMountOptions());
+                backupRepository.getAddress(), backupRepository.getMountOptions(), forced);
 
         BackupAnswer answer;
         try {
diff --git a/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java b/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
index a512292cd28f..6d0e3481d617 100644
--- a/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
+++ b/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
@@ -18,6 +18,7 @@
 
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.argThat;
 
 import java.util.Collections;
 import java.util.List;
@@ -115,11 +116,13 @@ public void testDeleteBackup() throws OperationTimedoutException, AgentUnavailab
         Mockito.when(hostDao.findById(hostId)).thenReturn(host);
         Mockito.when(backupRepositoryDao.findByBackupOfferingId(1L)).thenReturn(backupRepository);
         Mockito.when(vmInstanceDao.findByIdIncludingRemoved(1L)).thenReturn(vm);
-        Mockito.when(agentManager.send(anyLong(), Mockito.any(DeleteBackupCommand.class))).thenReturn(new BackupAnswer(new DeleteBackupCommand(null, null, null, null), true, "details"));
+        Mockito.when(agentManager.send(anyLong(), Mockito.any(DeleteBackupCommand.class))).thenReturn(new BackupAnswer(new DeleteBackupCommand(null, null, null, null, true), true, "details"));
         Mockito.when(backupDao.remove(1L)).thenReturn(true);
 
         boolean result = nasBackupProvider.deleteBackup(backup, true);
         Assert.assertTrue(result);
+        Mockito.verify(agentManager).send(anyLong(), argThat(command -> command instanceof DeleteBackupCommand &&
+                ((DeleteBackupCommand) command).isForced()));
     }
 
     @Test
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index 29d2d03c0bdc..c65caf7027b7 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -72,7 +72,7 @@ public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingRes
         List<PrimaryDataStoreTO> restoreVolumePools = command.getRestoreVolumePools();
         List<String> restoreVolumePaths = command.getRestoreVolumePaths();
         String restoreVolumeUuid = command.getRestoreVolumeUUID();
-        int timeout = command.getWait();
+        int timeout = command.getTimeout();
         String cacheMode = command.getCacheMode();
         String hostName = command.getHostName();
         KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
index 4772d3b472cf..1ef9c501fbbc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
@@ -39,6 +39,7 @@ public Answer execute(DeleteBackupCommand command, LibvirtComputingResource libv
         final String backupRepoType = command.getBackupRepoType();
         final String backupRepoAddress = command.getBackupRepoAddress();
         final String mountOptions = command.getMountOptions();
+        final boolean forced = command.isForced();
 
         List<String[]> commands = new ArrayList<>();
         commands.add(new String[]{
@@ -47,7 +48,8 @@ public Answer execute(DeleteBackupCommand command, LibvirtComputingResource libv
                 "-t", backupRepoType,
                 "-s", backupRepoAddress,
                 "-m", mountOptions,
-                "-p", backupPath
+                "-p", backupPath,
+                "-x", Boolean.toString(forced)
         });
 
         Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 54b97130619a..7afc78d03a06 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -73,7 +73,7 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
         List<String> restoreVolumePaths = command.getRestoreVolumePaths();
         // String restoreVolumeUuid = command.getRestoreVolumeUUID();
         Integer mountTimeout = command.getMountTimeout() * 1000;
-        int timeout = command.getWait();
+        int timeout = command.getWait() > 0 ? command.getWait() : command.getMountTimeout();
         String cacheMode = command.getCacheMode();
         KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
         List<String> volumePaths = command.getVolumePaths();
@@ -92,9 +92,9 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
                 restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, backupFile, backupFileChain,
                         new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
             } else if (Boolean.TRUE.equals(vmExists)) {
-                restoreVolumesOfExistingVM(volumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools.get(0));
+                restoreVolumesOfExistingVM(volumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools);
             } else {
-                restoreVolumesOfDestroyedVMs(volumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), timeout);
+                restoreVolumesOfDestroyedVMs(volumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools, timeout);
             }
         } catch (CloudRuntimeException e) {
             String errorMessage = e.getMessage() != null ? e.getMessage() : "";
@@ -105,13 +105,14 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
     }
 
     private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
-                                            String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool) {
+                                            String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> restoreVolumePools) {
         try {
             for (int idx = 0; idx < volumePaths.size(); idx++) {
                 String volumePath = volumePaths.get(idx);
                 String backupFile = backupFiles.get(idx);
                 String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
                 List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+                PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
                 if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
@@ -123,7 +124,8 @@ private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupP
     }
 
     private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
-                                              String backupRepoAddress, String backupRepoType, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, Integer timeout) {
+                                              String backupRepoAddress, String backupRepoType, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr,
+                                              List<PrimaryDataStoreTO> restoreVolumePools, Integer timeout) {
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
         try {
             for (int idx = 0; idx < volumePaths.size(); idx++) {
@@ -131,6 +133,7 @@ private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backu
                 String backupFile = backupFiles.get(idx);
                 String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
                 List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+                PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
                 if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 675062542b28..17b7596727ff 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -81,14 +81,30 @@ cleanup_dummy_vm() {
 }
 
 split_csv() {
-  local csv="$1"
-  IFS=',' read -r -a SPLIT_CSV_RESULT <<< "$csv"
+  tr ',' '\n' <<< "$1"
+}
+
+is_rbd_disk_path() {
+  local disk_path="$1"
+  [[ "$disk_path" == rbd:* || "$disk_path" == rbd/* ]]
 }
 
 get_backup_file_by_index() {
   local index="$1"
-  split_csv "$BACKUP_FILES"
-  echo "${SPLIT_CSV_RESULT[$index]}"
+  local fallback="$2"
+  if [[ -z "$BACKUP_FILES" ]]; then
+    echo "$fallback"
+    return
+  fi
+  local current=0
+  while IFS= read -r value; do
+    if [[ "$current" -eq "$index" ]]; then
+      echo "$value"
+      return
+    fi
+    current=$((current + 1))
+  done < <(split_csv "$BACKUP_FILES")
+  echo "$fallback"
 }
 
 dump_checkpoint_xml() {
@@ -127,9 +143,9 @@ create_dummy_vm_xml() {
     echo "    <emulator>/usr/bin/qemu-system-x86_64</emulator>"
   } > "$xml_file"
 
-  split_csv "$DISK_PATHS"
-  for index in "${!SPLIT_CSV_RESULT[@]}"; do
-    local disk_path="${SPLIT_CSV_RESULT[$index]}"
+  local index=0
+  while IFS= read -r disk_path; do
+    [[ -z "$disk_path" ]] && continue
     local disk_name
     disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
     if [[ "$disk_path" == rbd:* ]]; then
@@ -158,7 +174,8 @@ create_dummy_vm_xml() {
         echo "    </disk>"
       } >> "$xml_file"
     fi
-  done
+    index=$((index + 1))
+  done < <(split_csv "$DISK_PATHS")
 
   {
     echo "    <console type='pty'/>"
@@ -172,41 +189,85 @@ create_backup_xml_for_dummy_vm() {
   local checkpoint_xml="$2"
 
   echo "<domainbackup mode='push'><disks>" > "$backup_xml"
-  split_csv "$DISK_PATHS"
-  for index in "${!SPLIT_CSV_RESULT[@]}"; do
+  local index=0
+  while IFS= read -r disk_path; do
+    [[ -z "$disk_path" ]] && continue
     local disk_name
     disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
-    local target_file="$dest/$(get_backup_file_by_index "$index")"
+    local target_file="$dest/$(get_backup_file_by_index "$index" "volume-${index}.qcow2")"
     echo "<disk name='vd$disk_name' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$target_file'/>" >> "$backup_xml"
     if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
       echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$backup_xml"
     fi
     echo "</disk>" >> "$backup_xml"
-  done
+    index=$((index + 1))
+  done < <(split_csv "$DISK_PATHS")
   echo "</disks></domainbackup>" >> "$backup_xml"
 
   echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$checkpoint_xml"
-  for index in "${!SPLIT_CSV_RESULT[@]}"; do
+  index=0
+  while IFS= read -r disk_path; do
+    [[ -z "$disk_path" ]] && continue
     local disk_name
     disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
     echo "<disk name='vd$disk_name' checkpoint='bitmap'/>" >> "$checkpoint_xml"
-  done
+    index=$((index + 1))
+  done < <(split_csv "$DISK_PATHS")
   echo "</disks></domaincheckpoint>" >> "$checkpoint_xml"
 }
 
 parse_rbd_uri() {
   local uri="$1"
-  RBD_IMAGE="${uri#rbd:}"
-  RBD_IMAGE="${RBD_IMAGE%%:mon_host=*}"
-  local remainder="${uri#*:mon_host=}"
-  RBD_MON_HOSTS="${remainder%%:*}"
+  log -ne "parse_rbd_uri called with uri=[$uri]"
+
+  RBD_IMAGE=""
+  RBD_MON_HOST=""
+  RBD_USER=""
+  RBD_KEY=""
+
+  if [[ "$uri" == rbd:* ]]; then
+    local payload="${uri#rbd:}"
+    RBD_IMAGE="${payload%%:*}"
+
+    if [[ "$uri" =~ :mon_host=([^:]*) ]]; then
+      RBD_MON_HOST="${BASH_REMATCH[1]}"
+      RBD_MON_HOST="${RBD_MON_HOST//\\;/,}"
+      RBD_MON_HOST="${RBD_MON_HOST//\\:/:}"
+    fi
+
+    if [[ "$uri" =~ :id=([^:]*) ]]; then
+      RBD_USER="${BASH_REMATCH[1]}"
+    fi
+
+    if [[ "$uri" =~ :key=([^:]*) ]]; then
+      RBD_KEY="${BASH_REMATCH[1]}"
+    fi
+  elif [[ "$uri" == rbd/* ]]; then
+    RBD_IMAGE="$uri"
+  else
+    echo "Invalid RBD disk path: $uri"
+    cleanup
+  fi
+
+  if [[ -z "$RBD_IMAGE" ]]; then
+    echo "Failed to parse RBD image from uri: $uri"
+    cleanup
+  fi
+
+  log -ne "Parsed RBD uri -> IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
 }
 
-rbd_cli() {
-  local mon_hosts="$1"
-  shift
-  local mon_arg="${mon_hosts//;/,}"
-  rbd -m "$mon_arg" "$@"
+build_rbd_cmd() {
+  RBD_CMD=(rbd)
+  if [[ -n "$RBD_MON_HOST" ]]; then
+    RBD_CMD+=(-m "$RBD_MON_HOST")
+  fi
+  if [[ -n "$RBD_USER" ]]; then
+    RBD_CMD+=(--id "$RBD_USER")
+  fi
+  if [[ -n "$RBD_KEY" ]]; then
+    RBD_CMD+=(--key "$RBD_KEY")
+  fi
 }
 
 backup_running_vm() {
@@ -325,18 +386,46 @@ backup_stopped_vm() {
 
 backup_rbd_volumes() {
   mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
-  split_csv "$DISK_PATHS"
-  for index in "${!SPLIT_CSV_RESULT[@]}"; do
-    local disk_path="${SPLIT_CSV_RESULT[$index]}"
+  local index=0
+  while IFS= read -r disk_path; do
+    [[ -z "$disk_path" ]] && continue
+    local created_snapshot=""
+    log -ne "Loop disk raw value=[$disk_path]"
     parse_rbd_uri "$disk_path"
-    local output_file="$dest/$(get_backup_file_by_index "$index")"
-    rbd_cli "$RBD_MON_HOSTS" snap create "${RBD_IMAGE}@${CHECKPOINT_NAME}"
+    build_rbd_cmd
+    log -ne "Built RBD command: ${RBD_CMD[*]}"
+
+    local output_file="$dest/$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")"
+    log -ne "Starting RBD backup for disk path [$disk_path], resolved image [$RBD_IMAGE], output [$output_file]"
+
+    if ! timeout 30s "${RBD_CMD[@]}" info "$RBD_IMAGE" >> "$logFile" 2>&1; then
+      echo "Failed to access RBD image $RBD_IMAGE"
+      cleanup
+    fi
+
+    if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${CHECKPOINT_NAME}" >> "$logFile" 2>&1; then
+      echo "Failed to create RBD snapshot ${RBD_IMAGE}@${CHECKPOINT_NAME}"
+      cleanup
+    fi
+    created_snapshot="${RBD_IMAGE}@${CHECKPOINT_NAME}"
+
     if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      rbd_cli "$RBD_MON_HOSTS" export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${CHECKPOINT_NAME}" "$output_file"
+      if ! timeout 6h "${RBD_CMD[@]}" export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${CHECKPOINT_NAME}" "$output_file" >> "$logFile" 2>&1; then
+        echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${CHECKPOINT_NAME}"
+        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
+        cleanup
+      fi
     else
-      rbd_cli "$RBD_MON_HOSTS" export "${RBD_IMAGE}@${CHECKPOINT_NAME}" "$output_file"
+      if ! timeout 6h "${RBD_CMD[@]}" export "${RBD_IMAGE}@${CHECKPOINT_NAME}" "$output_file" >> "$logFile" 2>&1; then
+        echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${CHECKPOINT_NAME}"
+        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
+        cleanup
+      fi
     fi
-  done
+
+    log -ne "Finished exporting backup file [$output_file] size=[$(stat -c %s "$output_file" 2>/dev/null)]"
+    index=$((index + 1))
+  done < <(split_csv "$DISK_PATHS")
 }
 
 usage() {
@@ -377,7 +466,7 @@ if [[ "$OP" != "backup" ]]; then
   exit 1
 fi
 
-if [[ "$DISK_PATHS" == rbd:* || "$DISK_PATHS" == *",rbd:"* ]]; then
+if is_rbd_disk_path "$DISK_PATHS"; then
   backup_rbd_volumes
   exit 0
 fi
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 56f5f3f96898..11e63e5a3586 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -40,6 +40,7 @@ BACKUP_FILES=""
 DISK_PATHS=""
 QUIESCE=""
 DUMMY_VM=""
+FORCED="false"
 logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
@@ -407,7 +408,7 @@ delete_backup() {
 
     log -ne "Deleting backup with metadata [$dest]"
 
-    if has_child_backup "$checkpoint_name"; then
+    if [[ "$FORCED" != "true" ]] && has_child_backup "$checkpoint_name"; then
       echo "Cannot delete backup [$backup_dir]: child backup exists"
       umount "$mount_point"
       rmdir "$mount_point"
@@ -660,7 +661,7 @@ EOF
 
 function usage {
   echo ""
-  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false>"
+  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false> -x|--forced <true|false>"
   echo ""
   exit 1
 }
@@ -732,6 +733,11 @@ while [[ $# -gt 0 ]]; do
       shift
       shift
       ;;
+    -x|--forced)
+      FORCED="$2"
+      shift
+      shift
+      ;;
     -d|--diskpaths)
       DISK_PATHS="$2"
       shift

From 4ae45358acde4b3bfb56ffe200f8a310f74598eb Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 16:49:32 +0900
Subject: [PATCH 26/93] =?UTF-8?q?=ED=81=AC=EB=A1=9C=EC=8A=A4=EC=A1=B4=20?=
 =?UTF-8?q?=ED=99=9C=EC=84=B1=ED=99=94=EB=90=9C=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EA=B3=A0=EB=A0=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/NASBackupProviderTest.java         |   4 +-
 ...tCommvaultRestoreBackupCommandWrapper.java | 200 ++++++++++++++++-
 .../LibvirtRestoreBackupCommandWrapper.java   | 203 +++++++++++++++++-
 scripts/vm/hypervisor/kvm/cvtbackup.sh        |  32 ++-
 4 files changed, 416 insertions(+), 23 deletions(-)

diff --git a/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java b/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
index 6d0e3481d617..c5814cdde901 100644
--- a/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
+++ b/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
@@ -18,7 +18,6 @@
 
 import static org.mockito.ArgumentMatchers.anyLong;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.argThat;
 
 import java.util.Collections;
 import java.util.List;
@@ -121,8 +120,7 @@ public void testDeleteBackup() throws OperationTimedoutException, AgentUnavailab
 
         boolean result = nasBackupProvider.deleteBackup(backup, true);
         Assert.assertTrue(result);
-        Mockito.verify(agentManager).send(anyLong(), argThat(command -> command instanceof DeleteBackupCommand &&
-                ((DeleteBackupCommand) command).isForced()));
+        Mockito.verify(agentManager).send(anyLong(), Mockito.<DeleteBackupCommand>argThat(DeleteBackupCommand::isForced));
     }
 
     @Test
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index c65caf7027b7..56695f0f603a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -46,6 +46,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
@@ -112,7 +113,7 @@ private void restoreVolumesOfExistingVM(KVMStoragePoolManager storagePoolMgr, Li
                 String backupVolumeUuid = backedVolumesUUIDs.get(idx);
                 List<String> localBackupPaths = getLocalBackupPaths(backupPath, backupFiles, backupFileChains, idx, getLegacyBackupFileName(diskType, backupVolumeUuid));
                 diskType = "datadisk";
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, restoreVolumePath, localBackupPaths, timeout)) {
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, restoreVolumePath, localBackupPaths, timeout, backupPath, idx)) {
                     throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", backupVolumeUuid));
                 }
             }
@@ -131,7 +132,7 @@ private void restoreVolumesOfDestroyedVMs(KVMStoragePoolManager storagePoolMgr,
                 String volumeUuid = volumePath.substring(volumePath.lastIndexOf(File.separator) + 1);
                 List<String> localBackupPaths = getLocalBackupPaths(backupPath, backupFiles, backupFileChains, i, getLegacyBackupFileName(diskType, volumeUuid));
                 diskType = "datadisk";
-                if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout)) {
+                if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout, backupPath, i)) {
                     throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUuid));
                 }
             }
@@ -145,7 +146,7 @@ private void restoreVolume(KVMStoragePoolManager storagePoolMgr, String backupPa
                                Pair<String, VirtualMachine.State> vmNameAndState, int timeout, String cacheMode) {
         try {
             List<String> localBackupPaths = getLocalBackupPaths(backupPath, backupFiles, backupFileChains, 0, getLegacyBackupFileName(diskType, volumeUUID));
-            if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout, true)) {
+            if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout, backupPath, 0, true)) {
                 throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUUID));
             }
             if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
@@ -211,16 +212,22 @@ private boolean checkBackupPathExists(String backupPath) {
     }
 
     private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, false);
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, null, 0, false);
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
+                                            String backupRootPath, int backupIndex) {
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, backupRootPath, backupIndex, false);
+    }
+
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
+                                            String backupRootPath, int backupIndex, boolean createTargetVolume) {
         if (backupPaths == null || backupPaths.isEmpty()) {
             return false;
         }
         if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-            if (backupPaths.size() > 1 && backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
-                throw new CloudRuntimeException("Incremental RBD backup chains can only be restored to RBD storage pools");
+            if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+                return restoreIncrementalRbdBackupChainToFileVolume(volumePath, backupPaths, timeout, backupRootPath, backupIndex);
             }
             return replaceFileVolumeWithBackup(volumePath, getLastExistingBackupPath(backupPaths), timeout);
         }
@@ -228,6 +235,22 @@ private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, Pr
         return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
     }
 
+    private boolean restoreIncrementalRbdBackupChainToFileVolume(String volumePath, List<String> backupPaths, int timeout, String backupRootPath, int backupIndex) {
+        if (StringUtils.isBlank(backupRootPath)) {
+            throw new CloudRuntimeException("Unable to locate backup root path for incremental RBD restore");
+        }
+        RbdImageSpec sourceImage = getRbdImageSpecFromMetadata(backupRootPath, backupIndex);
+        String tempImage = sourceImage.buildTempImageSpec();
+        try {
+            if (!importBackupChainToTemporaryRbd(backupPaths, timeout, sourceImage, tempImage)) {
+                return false;
+            }
+            return convertTemporaryRbdToFileVolume(volumePath, timeout, sourceImage, tempImage);
+        } finally {
+            removeTemporaryRbdImage(sourceImage, tempImage, timeout);
+        }
+    }
+
     private String getFirstExistingBackupPath(List<String> backupPaths) {
         for (String backupPath : backupPaths) {
             if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
@@ -264,6 +287,23 @@ private boolean replaceFileVolumeWithBackup(String volumePath, String backupPath
         }
     }
 
+    private boolean convertTemporaryRbdToFileVolume(String volumePath, int timeout, RbdImageSpec sourceImage, String tempImage) {
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
+            srcBackupFile = new QemuImgFile(sourceImage.buildQemuUri(tempImage), QemuImg.PhysicalDiskFormat.RAW);
+            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
+            qemu.convert(srcBackupFile, destVolumeFile);
+            return true;
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : tempImage;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : volumePath;
+            logger.error("Failed to convert temporary RBD {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
+        }
+    }
+
     private QemuImg.PhysicalDiskFormat getBackupFileFormat(String backupPath) {
         if (backupPath.endsWith(".raw")) {
             return QemuImg.PhysicalDiskFormat.RAW;
@@ -380,6 +420,63 @@ private String formatRbdMonHosts(String hosts, int port) {
         return String.join(",", formattedHosts);
     }
 
+    private boolean importBackupChainToTemporaryRbd(List<String> backupPaths, int timeout, RbdImageSpec sourceImage, String tempImage) {
+        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
+            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
+        }
+        String importCommand = sourceImage.buildRbdCommand("import", quote(backupPaths.get(0)), quote(tempImage));
+        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to import base RBD backup {} into temporary image {}", backupPaths.get(0), tempImage);
+            return false;
+        }
+        for (int index = 1; index < backupPaths.size(); index++) {
+            String backupPath = backupPaths.get(index);
+            if (!backupPath.endsWith(".rbdiff")) {
+                continue;
+            }
+            String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
+            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void removeTemporaryRbdImage(RbdImageSpec sourceImage, String tempImage, int timeout) {
+        String removeCommand = sourceImage.buildRbdCommand("rm", quote(tempImage));
+        Script.runSimpleBashScriptForExitValue(removeCommand, timeout * 1000, false);
+    }
+
+    private RbdImageSpec getRbdImageSpecFromMetadata(String backupRootPath, int backupIndex) {
+        java.nio.file.Path metadataPath = Paths.get(backupRootPath, "rbd-backup.meta");
+        if (!Files.exists(metadataPath)) {
+            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
+        }
+        try {
+            java.util.Map<String, String> metadata = Files.readAllLines(metadataPath).stream()
+                    .map(String::trim)
+                    .filter(line -> !line.isEmpty() && line.contains("="))
+                    .map(line -> line.split("=", 2))
+                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
+            String diskPaths = metadata.get("disk_paths");
+            if (StringUtils.isBlank(diskPaths)) {
+                throw new CloudRuntimeException("RBD backup metadata does not contain disk_paths");
+            }
+            List<String> values = Arrays.asList(diskPaths.split(","));
+            if (backupIndex >= values.size()) {
+                throw new CloudRuntimeException(String.format("RBD backup metadata does not contain disk path for index %d", backupIndex));
+            }
+            return RbdImageSpec.fromUri(values.get(backupIndex));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
+        }
+    }
+
+    private String quote(String value) {
+        return "'" + value.replace("'", "'\"'\"'") + "'";
+    }
+
     private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr, String vmName, PrimaryDataStoreTO volumePool, String volumePath, String cacheMode) {
         String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
         int exitValue;
@@ -460,4 +557,93 @@ private void fetchBackupFile(String hostName, String backupPath) {
                     hostName, backupPath, backupPath));
         }
     }
+
+    private static final class RbdImageSpec {
+        private final String image;
+        private final String monHost;
+        private final String user;
+        private final String key;
+
+        private RbdImageSpec(String image, String monHost, String user, String key) {
+            this.image = image;
+            this.monHost = monHost;
+            this.user = user;
+            this.key = key;
+        }
+
+        private static RbdImageSpec fromUri(String uri) {
+            String image = null;
+            String monHost = null;
+            String user = null;
+            String key = null;
+            if (uri.startsWith("rbd:")) {
+                String payload = uri.substring("rbd:".length());
+                image = payload.contains(":") ? payload.substring(0, payload.indexOf(':')) : payload;
+                monHost = extract(uri, ":mon_host=([^:]*)");
+                if (monHost != null) {
+                    monHost = monHost.replace("\\;", ",").replace("\\:", ":");
+                }
+                user = extract(uri, ":id=([^:]*)");
+                key = extract(uri, ":key=([^:]*)");
+            } else if (uri.startsWith("rbd/")) {
+                image = uri;
+            }
+            if (StringUtils.isBlank(image)) {
+                throw new CloudRuntimeException(String.format("Unable to parse RBD disk path: %s", uri));
+            }
+            return new RbdImageSpec(image, monHost, user, key);
+        }
+
+        private static String extract(String value, String regex) {
+            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile(regex).matcher(value);
+            return matcher.find() ? matcher.group(1) : null;
+        }
+
+        private String buildTempImageSpec() {
+            return String.format("%s-csrestore-%s", image, org.apache.commons.lang3.RandomStringUtils.randomAlphanumeric(8).toLowerCase(Locale.ROOT));
+        }
+
+        private String buildRbdCommand(String action, String source, String target) {
+            StringBuilder command = new StringBuilder("rbd");
+            if (StringUtils.isNotBlank(monHost)) {
+                command.append(" -m ").append(quoteArg(monHost));
+            }
+            if (StringUtils.isNotBlank(user)) {
+                command.append(" --id ").append(quoteArg(user));
+            }
+            if (StringUtils.isNotBlank(key)) {
+                command.append(" --key ").append(quoteArg(key));
+            }
+            command.append(" ").append(action);
+            if (StringUtils.isNotBlank(source)) {
+                command.append(" ").append(source);
+            }
+            if (StringUtils.isNotBlank(target)) {
+                command.append(" ").append(target);
+            }
+            return command.toString();
+        }
+
+        private String buildRbdCommand(String action, String target) {
+            return buildRbdCommand(action, null, target);
+        }
+
+        private String buildQemuUri(String imageSpec) {
+            StringBuilder uri = new StringBuilder("rbd:").append(imageSpec);
+            if (StringUtils.isNotBlank(monHost)) {
+                uri.append(":mon_host=").append(monHost.replace(",", "\\;"));
+            }
+            if (StringUtils.isNotBlank(user)) {
+                uri.append(":id=").append(user);
+            }
+            if (StringUtils.isNotBlank(key)) {
+                uri.append(":key=").append(key);
+            }
+            return uri.toString();
+        }
+
+        private String quoteArg(String value) {
+            return "'" + value.replace("'", "'\"'\"'") + "'";
+        }
+    }
 }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 7afc78d03a06..a3a1df6b6305 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -45,6 +45,7 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -113,7 +114,8 @@ private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupP
                 String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
                 List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
                 PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout)) {
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
+                        String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), idx)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
             }
@@ -134,7 +136,8 @@ private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backu
                 String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
                 List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
                 PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout)) {
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
+                        String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), idx)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
             }
@@ -149,7 +152,8 @@ private void restoreVolume(String backupPath, String backupRepoType, String back
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
         try {
             List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
-            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, mountTimeout)) {
+            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, mountTimeout,
+                    String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), 0)) {
                 throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
             }
             if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
@@ -245,16 +249,22 @@ private boolean checkBackupPathExists(String backupPath) {
     }
 
     private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, false);
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, null, 0, false);
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
+                                            String backupRootPath, int backupIndex) {
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, backupRootPath, backupIndex, false);
+    }
+
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
+                                            String backupRootPath, int backupIndex, boolean createTargetVolume) {
         if (backupPaths == null || backupPaths.isEmpty()) {
             return false;
         }
         if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-            if (backupPaths.size() > 1 && backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
-                throw new CloudRuntimeException("Incremental RBD backup chains can only be restored to RBD storage pools");
+            if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+                return restoreIncrementalRbdBackupChainToFileVolume(volumePath, backupPaths, timeout, backupRootPath, backupIndex);
             }
             return replaceFileVolumeWithBackup(volumePath, getFirstExistingBackupPath(backupPaths), timeout);
         }
@@ -262,6 +272,22 @@ private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, Pr
         return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
     }
 
+    private boolean restoreIncrementalRbdBackupChainToFileVolume(String volumePath, List<String> backupPaths, int timeout, String backupRootPath, int backupIndex) {
+        if (StringUtils.isBlank(backupRootPath)) {
+            throw new CloudRuntimeException("Unable to locate backup root path for incremental RBD restore");
+        }
+        RbdImageSpec sourceImage = getRbdImageSpecFromMetadata(backupRootPath, backupIndex);
+        String tempImage = sourceImage.buildTempImageSpec();
+        try {
+            if (!importBackupChainToTemporaryRbd(backupPaths, timeout, sourceImage, tempImage)) {
+                return false;
+            }
+            return convertTemporaryRbdToFileVolume(volumePath, timeout, sourceImage, tempImage);
+        } finally {
+            removeTemporaryRbdImage(sourceImage, tempImage, timeout);
+        }
+    }
+
     private String getFirstExistingBackupPath(List<String> backupPaths) {
         for (String backupPath : backupPaths) {
             if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
@@ -288,6 +314,23 @@ private boolean replaceFileVolumeWithBackup(String volumePath, String backupPath
         }
     }
 
+    private boolean convertTemporaryRbdToFileVolume(String volumePath, int timeout, RbdImageSpec sourceImage, String tempImage) {
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
+            srcBackupFile = new QemuImgFile(sourceImage.buildQemuUri(tempImage), QemuImg.PhysicalDiskFormat.RAW);
+            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
+            qemu.convert(srcBackupFile, destVolumeFile);
+            return true;
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : tempImage;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : volumePath;
+            logger.error("Failed to convert temporary RBD {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
+        }
+    }
+
     private QemuImg.PhysicalDiskFormat getBackupFileFormat(String backupPath) {
         if (backupPath.endsWith(".raw")) {
             return QemuImg.PhysicalDiskFormat.RAW;
@@ -404,6 +447,152 @@ private String formatRbdMonHosts(String hosts, int port) {
         return String.join(",", formattedHosts);
     }
 
+    private boolean importBackupChainToTemporaryRbd(List<String> backupPaths, int timeout, RbdImageSpec sourceImage, String tempImage) {
+        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
+            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
+        }
+        String importCommand = sourceImage.buildRbdCommand("import", quote(backupPaths.get(0)), quote(tempImage));
+        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to import base RBD backup {} into temporary image {}", backupPaths.get(0), tempImage);
+            return false;
+        }
+        for (int index = 1; index < backupPaths.size(); index++) {
+            String backupPath = backupPaths.get(index);
+            if (!backupPath.endsWith(".rbdiff")) {
+                continue;
+            }
+            String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
+            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private void removeTemporaryRbdImage(RbdImageSpec sourceImage, String tempImage, int timeout) {
+        String removeCommand = sourceImage.buildRbdCommand("rm", quote(tempImage));
+        Script.runSimpleBashScriptForExitValue(removeCommand, timeout * 1000, false);
+    }
+
+    private RbdImageSpec getRbdImageSpecFromMetadata(String backupRootPath, int backupIndex) {
+        java.nio.file.Path metadataPath = Paths.get(backupRootPath, "rbd-backup.meta");
+        if (!Files.exists(metadataPath)) {
+            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
+        }
+        try {
+            Map<String, String> metadata = Files.readAllLines(metadataPath).stream()
+                    .map(String::trim)
+                    .filter(line -> !line.isEmpty() && line.contains("="))
+                    .map(line -> line.split("=", 2))
+                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
+            String diskPaths = metadata.get("disk_paths");
+            if (StringUtils.isBlank(diskPaths)) {
+                throw new CloudRuntimeException("RBD backup metadata does not contain disk_paths");
+            }
+            List<String> values = Arrays.asList(diskPaths.split(","));
+            if (backupIndex >= values.size()) {
+                throw new CloudRuntimeException(String.format("RBD backup metadata does not contain disk path for index %d", backupIndex));
+            }
+            return RbdImageSpec.fromUri(values.get(backupIndex));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
+        }
+    }
+
+    private String quote(String value) {
+        return "'" + value.replace("'", "'\"'\"'") + "'";
+    }
+
+    private static final class RbdImageSpec {
+        private final String image;
+        private final String monHost;
+        private final String user;
+        private final String key;
+
+        private RbdImageSpec(String image, String monHost, String user, String key) {
+            this.image = image;
+            this.monHost = monHost;
+            this.user = user;
+            this.key = key;
+        }
+
+        private static RbdImageSpec fromUri(String uri) {
+            String image = null;
+            String monHost = null;
+            String user = null;
+            String key = null;
+            if (uri.startsWith("rbd:")) {
+                String payload = uri.substring("rbd:".length());
+                image = payload.contains(":") ? payload.substring(0, payload.indexOf(':')) : payload;
+                monHost = extract(uri, ":mon_host=([^:]*)");
+                if (monHost != null) {
+                    monHost = monHost.replace("\\;", ",").replace("\\:", ":");
+                }
+                user = extract(uri, ":id=([^:]*)");
+                key = extract(uri, ":key=([^:]*)");
+            } else if (uri.startsWith("rbd/")) {
+                image = uri;
+            }
+            if (StringUtils.isBlank(image)) {
+                throw new CloudRuntimeException(String.format("Unable to parse RBD disk path: %s", uri));
+            }
+            return new RbdImageSpec(image, monHost, user, key);
+        }
+
+        private static String extract(String value, String regex) {
+            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile(regex).matcher(value);
+            return matcher.find() ? matcher.group(1) : null;
+        }
+
+        private String buildTempImageSpec() {
+            return String.format("%s-csrestore-%s", image, RandomStringUtils.randomAlphanumeric(8).toLowerCase(Locale.ROOT));
+        }
+
+        private String buildRbdCommand(String action, String source, String target) {
+            StringBuilder command = new StringBuilder("rbd");
+            if (StringUtils.isNotBlank(monHost)) {
+                command.append(" -m ").append(quoteArg(monHost));
+            }
+            if (StringUtils.isNotBlank(user)) {
+                command.append(" --id ").append(quoteArg(user));
+            }
+            if (StringUtils.isNotBlank(key)) {
+                command.append(" --key ").append(quoteArg(key));
+            }
+            command.append(" ").append(action);
+            if (StringUtils.isNotBlank(source)) {
+                command.append(" ").append(source);
+            }
+            if (StringUtils.isNotBlank(target)) {
+                command.append(" ").append(target);
+            }
+            return command.toString();
+        }
+
+        private String buildRbdCommand(String action, String target) {
+            return buildRbdCommand(action, null, target);
+        }
+
+        private String buildQemuUri(String imageSpec) {
+            StringBuilder uri = new StringBuilder("rbd:").append(imageSpec);
+            if (StringUtils.isNotBlank(monHost)) {
+                uri.append(":mon_host=").append(monHost.replace(",", "\\;"));
+            }
+            if (StringUtils.isNotBlank(user)) {
+                uri.append(":id=").append(user);
+            }
+            if (StringUtils.isNotBlank(key)) {
+                uri.append(":key=").append(key);
+            }
+            return uri.toString();
+        }
+
+        private String quoteArg(String value) {
+            return "'" + value.replace("'", "'\"'\"'") + "'";
+        }
+    }
+
     private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr, String vmName, PrimaryDataStoreTO volumePool, String volumePath, String cacheMode) {
         String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
         int exitValue;
diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 17b7596727ff..147d015872a9 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -270,6 +270,24 @@ build_rbd_cmd() {
   fi
 }
 
+write_rbd_backup_metadata() {
+  local backup_type="$1"
+  local checkpoint_name="$2"
+  local parent_checkpoint_name="$3"
+
+  cat > "$dest/rbd-backup.meta" <<EOF
+vm_name=$VM
+backup_type=$backup_type
+checkpoint_name=$checkpoint_name
+parent_checkpoint_name=$parent_checkpoint_name
+disk_paths=$DISK_PATHS
+backup_files=$BACKUP_FILES
+backup_dir=$BACKUP_DIR
+EOF
+
+  log -ne "Wrote RBD backup metadata to [$dest/rbd-backup.meta]"
+}
+
 backup_running_vm() {
   mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
   local parent_checkpoint_file=""
@@ -328,10 +346,10 @@ backup_running_vm() {
   done
 
   if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
-    split_csv "$BACKUP_FILES"
-    for backup_file in "${SPLIT_CSV_RESULT[@]}"; do
+    while IFS= read -r backup_file; do
+      [[ -z "$backup_file" ]] && continue
       qemu-img rebase -u -F qcow2 -b "$PARENT_BACKUP_DIR/$backup_file" "$dest/$backup_file" > /dev/null 2>&1 || true
-    done
+    done < <(split_csv "$BACKUP_FILES")
   fi
 
   dump_checkpoint_xml "$VM"
@@ -372,10 +390,10 @@ backup_stopped_vm() {
   done
 
   if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
-    split_csv "$BACKUP_FILES"
-    for backup_file in "${SPLIT_CSV_RESULT[@]}"; do
+    while IFS= read -r backup_file; do
+      [[ -z "$backup_file" ]] && continue
       qemu-img rebase -u -F qcow2 -b "$PARENT_BACKUP_DIR/$backup_file" "$dest/$backup_file" > /dev/null 2>&1 || true
-    done
+    done < <(split_csv "$BACKUP_FILES")
   fi
 
   dump_checkpoint_xml "$dummy_vm"
@@ -426,6 +444,8 @@ backup_rbd_volumes() {
     log -ne "Finished exporting backup file [$output_file] size=[$(stat -c %s "$output_file" 2>/dev/null)]"
     index=$((index + 1))
   done < <(split_csv "$DISK_PATHS")
+
+  write_rbd_backup_metadata "$BACKUP_TYPE" "$CHECKPOINT_NAME" "$PARENT_CHECKPOINT_NAME"
 }
 
 usage() {

From 085b62a045e8afbbd1d65059cc567ae692513900 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 17:15:14 +0900
Subject: [PATCH 27/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=20=EC=B2=B4=EC=9D=B8?=
 =?UTF-8?q?=20=EA=B8=B8=EC=9D=B4=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20VM?=
 =?UTF-8?q?=EC=8A=A4=EB=83=85=EC=83=B7=20=EA=B4=80=EB=A0=A8=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudstack/backup/BackupManager.java      |   9 +
 .../backup/CommvaultBackupProvider.java       | 265 +++++++++++-------
 .../cloudstack/backup/NASBackupProvider.java  | 103 +++++--
 .../vm/snapshot/VMSnapshotManagerImpl.java    |   8 +
 .../cloudstack/backup/BackupManagerImpl.java  |   1 +
 5 files changed, 249 insertions(+), 137 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
index 0c83f53ccf0a..0247ccd83807 100644
--- a/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupManager.java
@@ -76,6 +76,15 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
             ConfigKey.Scope.Cluster,
             null);
 
+    ConfigKey<Integer> BackupDeltaMax = new ConfigKey<>(Integer.class,
+            "backup.delta.max",
+            "Advanced",
+            "10",
+            "Max incremental backups between two full backups for KVM backup providers.",
+            true,
+            ConfigKey.Scope.Global,
+            null);
+
     ConfigKey<Long> DefaultMaxAccountBackups = new ConfigKey<Long>("Account Defaults", Long.class,
             "max.account.backups",
             "20",
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index c5676a9fd500..4fc68b0a5dc8 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -93,6 +93,7 @@
 import java.util.regex.Pattern;
 import javax.inject.Inject;
 
+import static org.apache.cloudstack.backup.BackupManager.BackupDeltaMax;
 import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
 import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
 
@@ -272,11 +273,7 @@ protected Host getVMHypervisorHostForBackup(VirtualMachine vm) {
     public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         final Host vmHost = getVMHypervisorHostForBackup(vm);
         final HostVO vmHostVO = hostDao.findById(vmHost.getId());
-        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.DiskAndMemory))) {
-            LOG.debug("Commvault backup provider cannot take backups of a VM [{}] with disk-and-memory VM snapshots. Restoring the backup will corrupt any newer disk-and-memory " +
-                    "VM snapshots.", vm);
-            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has disk-and-memory VM snapshots.", vm.getUuid()));
-        }
+        validateNoVmSnapshots(vm);
 
         try {
             String commvaultServer = getUrlDomain(CommvaultUrl.value());
@@ -304,15 +301,138 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
             }
         }
 
-        final Date creationDate = new Date();
-        final String backupPath = String.format("%s/%s/%s", COMMVAULT_DIRECTORY, vm.getInstanceName(),
-                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
+        final String backupPath = buildBackupPath(vm);
         List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
         vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
         Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
         validateVolumePoolTypes(volumePoolsAndPaths.first());
         final Backup latestBackup = getLatestBackedUpBackup(vm);
         final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup, vmHost);
+        Pair<Boolean, Backup> result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, backupPath, vmVolumes, volumePoolsAndPaths,
+                latestBackup, incrementalBackup, incrementalBackup && vmVolumes.size() > 1);
+        if (!result.first() && incrementalBackup && vmVolumes.size() > 1) {
+            LOG.warn("Incremental backup failed for multi-disk VM [{}]. Retrying as full backup to preserve disk consistency.", vm);
+            String fallbackBackupPath = buildBackupPath(vm);
+            return executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, fallbackBackupPath, vmVolumes, volumePoolsAndPaths,
+                    null, false, false);
+        }
+        return result;
+    }
+
+    private Backup getLatestBackedUpBackup(VirtualMachine vm) {
+        List<Backup> backups = backupDao.listByVmId(null, vm.getId());
+        return backups.stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(b -> Backup.Status.BackedUp.equals(b.getStatus()))
+                .peek(backupDao::loadDetails)
+                .max(Comparator.comparing(BackupVO::getDate))
+                .orElse(null);
+    }
+
+    private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBackup, Host vmHost) {
+        if (latestBackup == null) {
+            return false;
+        }
+
+        Long clusterId = getClusterIdFromRootVolume(vm);
+        if (clusterId == null) {
+            return false;
+        }
+
+        if (!Boolean.TRUE.equals(KvmIncrementalBackup.valueIn(clusterId))) {
+            return false;
+        }
+
+        String stageHost = getBackupDetail(latestBackup, DETAIL_STAGE_HOST);
+        return Objects.equals(stageHost, vmHost.getName()) && getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+    }
+
+    private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {
+        List<BackupVO> backups = backupDao.listByVmId(null, vm.getId()).stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
+                .peek(backupDao::loadDetails)
+                .collect(Collectors.toList());
+        Map<String, BackupVO> backupsByUuid = backups.stream().collect(Collectors.toMap(BackupVO::getUuid, backup -> backup, (left, right) -> left));
+        int chainSize = 1;
+        Backup current = latestBackup;
+        while (current != null) {
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            if (parentBackupUuid == null) {
+                break;
+            }
+            current = backupsByUuid.get(parentBackupUuid);
+            if (current != null) {
+                chainSize++;
+            }
+        }
+        return chainSize;
+    }
+
+    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, Map<String, String> details) {
+        BackupVO backup = new BackupVO();
+        backup.setVmId(vm.getId());
+        backup.setExternalId(backupPath);
+        backup.setType(backupType);
+        backup.setDate(new Date());
+        long virtualSize = 0L;
+        for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
+            if (Volume.State.Ready.equals(volume.getState())) {
+                virtualSize += volume.getSize();
+            }
+        }
+        backup.setProtectedSize(virtualSize);
+        backup.setStatus(Backup.Status.BackingUp);
+        backup.setBackupOfferingId(vm.getBackupOfferingId());
+        backup.setAccountId(vm.getAccountId());
+        backup.setDomainId(vm.getDomainId());
+        backup.setZoneId(vm.getDataCenterId());
+        backup.setName(backupManager.getBackupNameFromVM(vm));
+        backup.setDetails(details);
+
+        return backupDao.persist(backup);
+    }
+
+    private Map<String, String> getBackupDetails(VirtualMachine vm, String backupPath, String checkpointName, String backupEngine, Backup latestBackup,
+                                                 boolean incrementalBackup, String stageHost) {
+        Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
+        details.put(DETAIL_BACKUP_ENGINE, backupEngine);
+        details.put(DETAIL_STAGE_HOST, stageHost);
+        if (!incrementalBackup) {
+            return details;
+        }
+
+        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
+        details.put(DETAIL_CHECKPOINT_PATH, String.format("%s/checkpoints/%s.xml", backupPath, checkpointName));
+        details.put(DETAIL_PARENT_BACKUP_UUID, latestBackup.getUuid());
+        details.put(DETAIL_PARENT_BACKUP_PATH, latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(',')));
+        details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
+        details.put(DETAIL_PARENT_CHECKPOINT_PATH, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
+        return details;
+    }
+
+    private String getBackupDetail(Backup backup, String key) {
+        return backup == null ? null : backup.getDetail(key);
+    }
+
+    private String getBackupDetail(Backup backup, String key, String defaultValue) {
+        String value = getBackupDetail(backup, key);
+        return value == null ? defaultValue : value;
+    }
+
+    private void validateNoVmSnapshots(VirtualMachine vm) {
+        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVm(vm.getId()))) {
+            LOG.debug("Commvault backup provider cannot take backups of a VM [{}] with VM snapshots.", vm);
+            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has VM snapshots.", vm.getUuid()));
+        }
+    }
+
+    private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM, Host vmHost, HostVO vmHostVO, CommvaultClient client,
+                                                String planId, String backupPath, List<VolumeVO> vmVolumes,
+                                                Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths, Backup latestBackup,
+                                                boolean incrementalBackup, boolean retryAsFullOnFailure) {
         final String requestedBackupType = incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL;
         final String checkpointName = String.format("backup.%s", UUID.randomUUID());
         final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
@@ -327,8 +447,9 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         command.setBackupType(requestedBackupType);
         command.setCheckpointName(checkpointName);
         command.setBackupFiles(backupFiles);
-        if (incrementalBackup) {
-            command.setParentBackupPath(getBackupDetail(latestBackup, DETAIL_PARENT_BACKUP_PATH, latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(','))));
+        if (incrementalBackup && latestBackup != null) {
+            command.setParentBackupPath(getBackupDetail(latestBackup, DETAIL_PARENT_BACKUP_PATH,
+                    latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(','))));
             command.setParentCheckpointName(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
             command.setParentCheckpointPath(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
         }
@@ -352,11 +473,10 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
             int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
             Ternary<String, String, String> credentials = getKVMHyperisorCredentials(vmHostVO);
             String cmd = String.format(RM_COMMAND, backupPath);
-            // 생성된 백업 폴더 경로로 해당 백업 세트의 백업 콘텐츠 경로 업데이트
             String clientId = client.getClientId(vmHost.getName());
             String subClientEntity = client.getSubclient(clientId, vm.getInstanceName());
             if (subClientEntity == null) {
-                LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to get subclient info commvault api");
+                LOG.error("Failed to take backup for VM {} to get subclient info commvault api", vm.getInstanceName());
             } else {
                 JSONObject jsonObject = new JSONObject(subClientEntity);
                 String subclientId = String.valueOf(jsonObject.get("subclientId"));
@@ -379,11 +499,10 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
                     String planName = client.getPlanName(planId);
                     String storagePolicyId = client.getStoragePolicyId(planName);
                     if (planName == null || storagePolicyId == null) {
-                        LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to get storage policy id commvault api");
+                        LOG.error("Failed to take backup for VM {} to get storage policy id commvault api", vm.getInstanceName());
                     } else {
-                        // 백업 실행
-                        String jobId = client.createBackup(subclientId, storagePolicyId, displayName, commCellName, clientId, companyId, companyName, instanceName, appName, applicationId,
-                                clientName, backupsetId, instanceId, subclientGUID, subclientName, csGUID, backupsetName, requestedBackupType);
+                        String jobId = client.createBackup(subclientId, storagePolicyId, displayName, commCellName, clientId, companyId, companyName, instanceName, appName,
+                                applicationId, clientName, backupsetId, instanceId, subclientGUID, subclientName, csGUID, backupsetName, requestedBackupType);
                         if (jobId != null) {
                             String jobStatus = client.getJobStatus(jobId);
                             String externalId = backupPath + "," + jobId;
@@ -413,119 +532,47 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
                                     backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
                                     if (backupDao.update(backupVO.getId(), backupVO)) {
                                         return new Pair<>(true, backupVO);
-                                    } else {
-                                        throw new CloudRuntimeException("Failed to update backup");
                                     }
-                                } else {
-                                    backupVO.setExternalId(externalId);
-                                    LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to get details job commvault api");
+                                    throw new CloudRuntimeException("Failed to update backup");
                                 }
+                                backupVO.setExternalId(externalId);
+                                LOG.error("Failed to take backup for VM {} to get details job commvault api", vm.getInstanceName());
                             } else {
                                 backupVO.setExternalId(externalId);
-                                LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to create backup job status is " + jobStatus);
+                                LOG.error("Failed to take backup for VM {} to create backup job status is {}", vm.getInstanceName(), jobStatus);
                             }
                         } else {
-                            LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to create backup job commvault api");
+                            LOG.error("Failed to take backup for VM {} to create backup job commvault api", vm.getInstanceName());
                         }
                     }
                 } else {
-                    LOG.error("Failed to take backup for VM " + vm.getInstanceName() + " to update backupset content path commvault api");
+                    LOG.error("Failed to take backup for VM {} to update backupset content path commvault api", vm.getInstanceName());
                 }
             }
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
             executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, cmd);
             return new Pair<>(false, null);
-        } else {
-            LOG.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
-            if (answer.getNeedsCleanup()) {
-                LOG.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
-                backupVO.setStatus(Backup.Status.Error);
-                backupDao.update(backupVO.getId(), backupVO);
-            } else {
-                backupVO.setStatus(Backup.Status.Failed);
-                backupDao.remove(backupVO.getId());
-            }
-            return new Pair<>(false, null);
-        }
-    }
-
-    private Backup getLatestBackedUpBackup(VirtualMachine vm) {
-        List<Backup> backups = backupDao.listByVmId(null, vm.getId());
-        return backups.stream()
-                .filter(Objects::nonNull)
-                .filter(b -> Backup.Status.BackedUp.equals(b.getStatus()))
-                .max(Comparator.comparing(Backup::getDate))
-                .orElse(null);
-    }
-
-    private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBackup, Host vmHost) {
-        if (latestBackup == null) {
-            return false;
-        }
-
-        Long clusterId = getClusterIdFromRootVolume(vm);
-        if (clusterId == null) {
-            return false;
         }
 
-        if (!Boolean.TRUE.equals(KvmIncrementalBackup.valueIn(clusterId))) {
-            return false;
-        }
-
-        String stageHost = getBackupDetail(latestBackup, DETAIL_STAGE_HOST);
-        return Objects.equals(stageHost, vmHost.getName());
-    }
-
-    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, Map<String, String> details) {
-        BackupVO backup = new BackupVO();
-        backup.setVmId(vm.getId());
-        backup.setExternalId(backupPath);
-        backup.setType(backupType);
-        backup.setDate(new Date());
-        long virtualSize = 0L;
-        for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
-            if (Volume.State.Ready.equals(volume.getState())) {
-                virtualSize += volume.getSize();
-            }
-        }
-        backup.setProtectedSize(virtualSize);
-        backup.setStatus(Backup.Status.BackingUp);
-        backup.setBackupOfferingId(vm.getBackupOfferingId());
-        backup.setAccountId(vm.getAccountId());
-        backup.setDomainId(vm.getDomainId());
-        backup.setZoneId(vm.getDataCenterId());
-        backup.setName(backupManager.getBackupNameFromVM(vm));
-        backup.setDetails(details);
-
-        return backupDao.persist(backup);
-    }
-
-    private Map<String, String> getBackupDetails(VirtualMachine vm, String backupPath, String checkpointName, String backupEngine, Backup latestBackup,
-                                                 boolean incrementalBackup, String stageHost) {
-        Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
-        details.put(DETAIL_BACKUP_ENGINE, backupEngine);
-        details.put(DETAIL_STAGE_HOST, stageHost);
-        if (!incrementalBackup) {
-            return details;
+        LOG.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
+        if (retryAsFullOnFailure) {
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+        } else if (answer != null && answer.getNeedsCleanup()) {
+            LOG.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
+            backupVO.setStatus(Backup.Status.Error);
+            backupDao.update(backupVO.getId(), backupVO);
+        } else {
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
         }
-
-        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
-        details.put(DETAIL_CHECKPOINT_PATH, String.format("%s/checkpoints/%s.xml", backupPath, checkpointName));
-        details.put(DETAIL_PARENT_BACKUP_UUID, latestBackup.getUuid());
-        details.put(DETAIL_PARENT_BACKUP_PATH, latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(',')));
-        details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
-        details.put(DETAIL_PARENT_CHECKPOINT_PATH, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
-        return details;
-    }
-
-    private String getBackupDetail(Backup backup, String key) {
-        return backup == null ? null : backup.getDetail(key);
+        return new Pair<>(false, null);
     }
 
-    private String getBackupDetail(Backup backup, String key, String defaultValue) {
-        String value = getBackupDetail(backup, key);
-        return value == null ? defaultValue : value;
+    private String buildBackupPath(VirtualMachine vm) {
+        return String.format("%s/%s/%s", COMMVAULT_DIRECTORY, vm.getInstanceName(),
+                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS").format(new Date()));
     }
 
     private void validateVolumePoolTypes(List<PrimaryDataStoreTO> volumePools) {
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 429cd36aba2d..3c52e79fbaf9 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -76,6 +76,7 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
+import static org.apache.cloudstack.backup.BackupManager.BackupDeltaMax;
 import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
 import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
 
@@ -210,37 +211,42 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
             throw new CloudRuntimeException("No valid backup repository found for the VM, please check the attached backup offering");
         }
 
-        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.DiskAndMemory))) {
-            logger.debug("NAS backup provider cannot take backups of a VM [{}] with disk-and-memory VM snapshots. Restoring the backup will corrupt any newer disk-and-memory " +
-                    "VM snapshots.", vm);
-            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has disk-and-memory VM snapshots.", vm.getUuid()));
-        }
-
-        final Date creationDate = new Date();
-        final String backupPath = String.format("%s/%s", vm.getInstanceName(),
-                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
-        final String checkpointName = backupPath.substring(backupPath.lastIndexOf("/") + 1);
+        validateNoVmSnapshots(vm);
         List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
         vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
         Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
         validateVolumePoolTypes(volumePoolsAndPaths.first());
         final BackupVO latestBackup = getLatestBackedUpBackup(vm);
         final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup);
+        Pair<Boolean, Backup> result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, latestBackup, incrementalBackup,
+                incrementalBackup && vmVolumes.size() > 1);
+        if (!result.first() && incrementalBackup && vmVolumes.size() > 1) {
+            LOG.warn("Incremental backup failed for multi-disk VM [{}]. Retrying as full backup to preserve disk consistency.", vm);
+            return executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, null, false, false);
+        }
+        return result;
+    }
+
+    private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM, Host host, BackupRepository backupRepository,
+                                                List<VolumeVO> vmVolumes, Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths,
+                                                Backup parentBackup, boolean incrementalBackup, boolean retryAsFullOnFailure) {
+        final String backupPath = buildBackupPath(vm);
+        final String checkpointName = backupPath.substring(backupPath.lastIndexOf("/") + 1);
         final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
         final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
 
         BackupVO backupVO = createBackupObject(vm, backupPath, incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL,
-                checkpointName, backupEngine, incrementalBackup ? latestBackup : null);
+                checkpointName, backupEngine, incrementalBackup ? parentBackup : null);
         TakeBackupCommand command = new TakeBackupCommand(vm.getInstanceName(), backupPath);
         command.setBackupType(backupVO.getType());
         command.setCheckpointName(checkpointName);
         command.setBackupFiles(backupFiles);
         command.setVolumePools(volumePoolsAndPaths.first());
         command.setVolumePaths(volumePoolsAndPaths.second());
-        if (incrementalBackup) {
-            command.setParentBackupPath(latestBackup.getExternalId());
-            command.setParentCheckpointName(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
-            command.setParentCheckpointPath(getBackupDetail(latestBackup, DETAIL_CHECKPOINT_PATH));
+        if (incrementalBackup && parentBackup != null) {
+            command.setParentBackupPath(parentBackup.getExternalId());
+            command.setParentCheckpointName(getBackupDetail(parentBackup, DETAIL_CHECKPOINT_NAME));
+            command.setParentCheckpointPath(getBackupDetail(parentBackup, DETAIL_CHECKPOINT_PATH));
         }
         command.setBackupRepoType(backupRepository.getType());
         command.setBackupRepoAddress(backupRepository.getAddress());
@@ -269,20 +275,34 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
             backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
             if (backupDao.update(backupVO.getId(), backupVO)) {
                 return new Pair<>(true, backupVO);
-            } else {
-                throw new CloudRuntimeException("Failed to update backup");
             }
+            throw new CloudRuntimeException("Failed to update backup");
+        }
+
+        logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
+        if (retryAsFullOnFailure) {
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+        } else if (answer != null && answer.getNeedsCleanup()) {
+            logger.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
+            backupVO.setStatus(Backup.Status.Error);
+            backupDao.update(backupVO.getId(), backupVO);
         } else {
-            logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
-            if (answer != null && answer.getNeedsCleanup()) {
-                logger.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
-                backupVO.setStatus(Backup.Status.Error);
-                backupDao.update(backupVO.getId(), backupVO);
-            } else {
-                backupVO.setStatus(Backup.Status.Failed);
-                backupDao.remove(backupVO.getId());
-            }
-            return new Pair<>(false, null);
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+        }
+        return new Pair<>(false, null);
+    }
+
+    private String buildBackupPath(VirtualMachine vm) {
+        return String.format("%s/%s", vm.getInstanceName(),
+                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS").format(new Date()));
+    }
+
+    private void validateNoVmSnapshots(VirtualMachine vm) {
+        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVm(vm.getId()))) {
+            logger.debug("NAS backup provider cannot take backups of a VM [{}] with VM snapshots.", vm);
+            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has VM snapshots.", vm.getUuid()));
         }
     }
 
@@ -347,7 +367,34 @@ private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBacku
             return false;
         }
 
-        return KvmIncrementalBackup.valueIn(clusterId);
+        if (!KvmIncrementalBackup.valueIn(clusterId)) {
+            return false;
+        }
+
+        return getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+    }
+
+    private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {
+        List<BackupVO> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId()).stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
+                .peek(backupDao::loadDetails)
+                .collect(Collectors.toList());
+        Map<String, BackupVO> backupsByUuid = backups.stream().collect(Collectors.toMap(BackupVO::getUuid, backup -> backup, (left, right) -> left));
+        int chainSize = 1;
+        Backup current = latestBackup;
+        while (current != null) {
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            if (parentBackupUuid == null) {
+                break;
+            }
+            current = backupsByUuid.get(parentBackupUuid);
+            if (current != null) {
+                chainSize++;
+            }
+        }
+        return chainSize;
     }
 
     private boolean hasDependentBackups(Backup backup) {
diff --git a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
index dc79c766072b..a070c8af20f4 100644
--- a/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
@@ -29,6 +29,8 @@
 import javax.naming.ConfigurationException;
 
 import org.apache.cloudstack.annotation.AnnotationService;
+import org.apache.cloudstack.backup.Backup;
+import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd;
@@ -179,6 +181,8 @@ public class VMSnapshotManagerImpl extends MutualExclusiveIdsManagerBase impleme
     PrimaryDataStoreDao _storagePoolDao;
     @Inject
     private AnnotationDao annotationDao;
+    @Inject
+    private BackupDao backupDao;
 
     VmWorkJobHandlerProxy _jobHandlerProxy = new VmWorkJobHandlerProxy(this);
 
@@ -448,6 +452,10 @@ public VMSnapshot allocVMSnapshot(Long vmId, String vsDisplayName, String vsDesc
             throw new CloudRuntimeException("There are other active Instance Snapshot tasks on the Instance, please try again later");
         }
 
+        if (backupDao.listByVmId(null, vmId).stream().anyMatch(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))) {
+            throw new CloudRuntimeException("Creating Instance Snapshot failed because the Instance has a backup chain.");
+        }
+
         VMSnapshot.Type vmSnapshotType = VMSnapshot.Type.Disk;
         if (snapshotMemory && userVmVo.getState() == VirtualMachine.State.Running)
             vmSnapshotType = VMSnapshot.Type.DiskAndMemory;
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 3bff33ef9a97..15707bb196a0 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1857,6 +1857,7 @@ public ConfigKey<?>[] getConfigKeys() {
                 BackupSyncPollingInterval,
                 BackupEnableAttachDetachVolumes,
                 KvmIncrementalBackup,
+                BackupDeltaMax,
                 DefaultMaxAccountBackups,
                 DefaultMaxAccountBackupStorage,
                 DefaultMaxProjectBackups,

From 6bda058484bffa64558d4557cdb07ba5d2f9a837 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 2 Apr 2026 17:32:14 +0900
Subject: [PATCH 28/93] Update CommvaultBackupProvider.java

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 4fc68b0a5dc8..4952113a2364 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -51,7 +51,6 @@
 import com.cloud.vm.VMInstanceVO;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.dao.VMInstanceDao;
-import com.cloud.vm.snapshot.VMSnapshot;
 import com.cloud.vm.snapshot.dao.VMSnapshotDao;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;

From 4075b5f1585618de1925c1b880bcabaee65b8b6f Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 09:59:12 +0900
Subject: [PATCH 29/93] =?UTF-8?q?RBD=ED=83=80=EC=9E=85=EC=9D=B8=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=ED=8C=8C=EC=9D=BC=EB=AA=85=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudstack/backup/NASBackupProvider.java  | 23 ++++++++++++++++---
 ...tCommvaultRestoreBackupCommandWrapper.java |  2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 3c52e79fbaf9..96094bab9cd1 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -577,21 +577,38 @@ private boolean isLegacyBackup(Backup backup) {
     }
 
     private String getLegacyBackupFileName(Backup.VolumeInfo volumeInfo) {
+        String volumePath = volumeInfo.getPath();
+        if (StringUtils.isNotBlank(volumePath) &&
+                (volumePath.endsWith(".qcow2") || volumePath.endsWith(".raw") || volumePath.endsWith(".rbdiff"))) {
+            return volumePath;
+        }
         String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
         return String.format("%s.%s.qcow2", diskPrefix, volumeInfo.getPath());
     }
 
     private List<String> getLegacyBackupFileCandidates(Backup.VolumeInfo volumeInfo) {
         List<String> candidates = new ArrayList<>();
+        String volumePath = volumeInfo.getPath();
+        if (StringUtils.isNotBlank(volumePath)) {
+            candidates.add(volumePath);
+            if (volumePath.contains("/")) {
+                String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
+                if (!Objects.equals(volumePath, baseName)) {
+                    candidates.add(baseName);
+                }
+            }
+        }
+
         String legacyFileName = getLegacyBackupFileName(volumeInfo);
-        candidates.add(legacyFileName);
+        if (!candidates.contains(legacyFileName)) {
+            candidates.add(legacyFileName);
+        }
 
-        String volumePath = volumeInfo.getPath();
         if (volumePath != null && volumePath.contains("/")) {
             String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
             String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
             String baseNameLegacyFile = String.format("%s.%s.qcow2", diskPrefix, baseName);
-            if (!Objects.equals(legacyFileName, baseNameLegacyFile)) {
+            if (!candidates.contains(baseNameLegacyFile)) {
                 candidates.add(baseNameLegacyFile);
             }
         }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index 56695f0f603a..bbdb0247be78 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -350,7 +350,7 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         QemuImgFile srcBackupFile = null;
         QemuImgFile destVolumeFile = null;
         try {
-            srcBackupFile = new QemuImgFile(backupPath, QemuImg.PhysicalDiskFormat.QCOW2);
+            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
             String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
             destVolumeFile = new QemuImgFile(rbdDestVolumeFile, QemuImg.PhysicalDiskFormat.RAW);
 

From 0718ba7ee43d6f9fbef41db08856228a347fd9bc Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 10:11:29 +0900
Subject: [PATCH 30/93] Update NASBackupProvider.java

---
 .../java/org/apache/cloudstack/backup/NASBackupProvider.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 96094bab9cd1..1e3c3c526cbf 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -59,6 +59,7 @@
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 

From b32d6095805dbf5695e149353ba80edc5a89f070 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 10:40:26 +0900
Subject: [PATCH 31/93] Update LibvirtRestoreBackupCommandWrapper.java

---
 .../resource/wrapper/LibvirtRestoreBackupCommandWrapper.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index a3a1df6b6305..f09edf7c1cbc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -93,9 +93,9 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
                 restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, backupFile, backupFileChain,
                         new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
             } else if (Boolean.TRUE.equals(vmExists)) {
-                restoreVolumesOfExistingVM(volumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools);
+                restoreVolumesOfExistingVM(restoreVolumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools);
             } else {
-                restoreVolumesOfDestroyedVMs(volumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools, timeout);
+                restoreVolumesOfDestroyedVMs(restoreVolumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools, timeout);
             }
         } catch (CloudRuntimeException e) {
             String errorMessage = e.getMessage() != null ? e.getMessage() : "";

From 88f6d6495e7ac4a79464e97a7d1cc11fe02dcc30 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 11:03:51 +0900
Subject: [PATCH 32/93] =?UTF-8?q?=ED=83=80=EC=9E=84=EC=95=84=EC=9B=83=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apache/cloudstack/backup/NASBackupProvider.java  | 12 +++++++++++-
 .../wrapper/LibvirtRestoreBackupCommandWrapper.java  |  7 ++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 1e3c3c526cbf..0320da2f945d 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -102,6 +102,13 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
             true,
             BackupFrameworkEnabled.key());
 
+    ConfigKey<Integer> NASBackupRestoreTimeout = new ConfigKey<>("Advanced", Integer.class,
+            "nas.backup.restore.timeout",
+            "1800",
+            "Timeout in seconds after which NAS backup restore operations fail.",
+            true,
+            BackupFrameworkEnabled.key());
+
     @Inject
     private BackupDao backupDao;
 
@@ -493,6 +500,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         restoreCommand.setVmExists(vm.getRemoved() == null);
         restoreCommand.setVmState(vm.getState());
         restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
+        restoreCommand.setWait(NASBackupRestoreTimeout.value());
 
         BackupAnswer answer;
         try {
@@ -730,6 +738,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         restoreCommand.setVmExists(null);
         restoreCommand.setVmState(vmNameAndState.second());
         restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
+        restoreCommand.setWait(NASBackupRestoreTimeout.value());
         restoreCommand.setCacheMode(cacheMode);
         restoreCommand.setVolumePaths(Collections.singletonList(String.format("%s/%s", pool.getPath(), volumeUUID)));
         restoreCommand.setBackupFiles(getBackupFiles(Collections.singletonList(matchingVolume), backup));
@@ -916,7 +925,8 @@ public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
     @Override
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey[]{
-                NASBackupRestoreMountTimeout
+                NASBackupRestoreMountTimeout,
+                NASBackupRestoreTimeout
         };
     }
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index f09edf7c1cbc..829b8c522bec 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -91,7 +91,7 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
                 int lastIndex = volumePath.lastIndexOf("/");
                 newVolumeId = volumePath.substring(lastIndex + 1);
                 restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, backupFile, backupFileChain,
-                        new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
+                        new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, timeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
             } else if (Boolean.TRUE.equals(vmExists)) {
                 restoreVolumesOfExistingVM(restoreVolumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools);
             } else {
@@ -148,11 +148,12 @@ private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backu
     }
 
     private void restoreVolume(String backupPath, String backupRepoType, String backupRepoAddress, String volumePath, String backupFile, String backupFileChain,
-                               Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
+                               Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, Integer timeout,
+                               KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
         try {
             List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
-            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, mountTimeout,
+            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
                     String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), 0)) {
                 throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
             }

From 41053d79371b8fc25103f5a8c5878fad9fb614a2 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 11:45:55 +0900
Subject: [PATCH 33/93] =?UTF-8?q?raw=ED=83=80=EC=9E=85=EC=9D=B4=EB=A9=B4?=
 =?UTF-8?q?=20Import=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=AA=85=EB=A0=B9?=
 =?UTF-8?q?=EC=96=B4=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tCommvaultRestoreBackupCommandWrapper.java | 33 +++++++++++++++++++
 .../LibvirtRestoreBackupCommandWrapper.java   | 33 +++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index bbdb0247be78..c55041747bb1 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -335,6 +335,10 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
 
         String backupPath = getFirstExistingBackupPath(backupPaths);
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        if (getBackupFileFormat(backupPath) == QemuImg.PhysicalDiskFormat.RAW) {
+            return importRawBackupToRbd(volumeStoragePool, volumePath, backupPath, timeout, createTargetVolume);
+        }
+
         QemuImg qemu;
         try {
             qemu = new QemuImg(timeout * 1000, true, false);
@@ -367,6 +371,20 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         return true;
     }
 
+    private boolean importRawBackupToRbd(KVMStoragePool volumeStoragePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+        if (!createTargetVolume && !volumeStoragePool.deletePhysicalDisk(volumePath, Storage.ImageFormat.RAW)) {
+            logger.error("Failed to delete existing RBD volume {} before raw import", volumePath);
+            return false;
+        }
+
+        String importCommand = buildRbdImportCommand(volumeStoragePool, backupPath, volumePath);
+        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to import raw backup {} into volume {}", backupPath, volumePath);
+            return false;
+        }
+        return true;
+    }
+
     private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths,
                                                      int timeout, boolean createTargetVolume) {
         if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
@@ -407,6 +425,21 @@ private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String back
         return command.toString();
     }
 
+    private String buildRbdImportCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" import ").append(backupPath).append(" ").append(volumePath);
+        return command.toString();
+    }
+
     private String formatRbdMonHosts(String hosts, int port) {
         String[] hostValues = hosts.split(",");
         List<String> formattedHosts = new ArrayList<>();
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 829b8c522bec..4d4f1daefbc1 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -363,6 +363,10 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
 
         String backupPath = getFirstExistingBackupPath(backupPaths);
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        if (getBackupFileFormat(backupPath) == QemuImg.PhysicalDiskFormat.RAW) {
+            return importRawBackupToRbd(volumeStoragePool, volumePath, backupPath, timeout, createTargetVolume);
+        }
+
         QemuImg qemu;
         try {
             qemu = new QemuImg(timeout * 1000, true, false);
@@ -395,6 +399,20 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         return true;
     }
 
+    private boolean importRawBackupToRbd(KVMStoragePool volumeStoragePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+        if (!createTargetVolume && !volumeStoragePool.deletePhysicalDisk(volumePath, Storage.ImageFormat.RAW)) {
+            logger.error("Failed to delete existing RBD volume {} before raw import", volumePath);
+            return false;
+        }
+
+        String importCommand = buildRbdImportCommand(volumeStoragePool, backupPath, volumePath);
+        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to import raw backup {} into volume {}", backupPath, volumePath);
+            return false;
+        }
+        return true;
+    }
+
     private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths,
                                                      int timeout, boolean createTargetVolume) {
         if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
@@ -435,6 +453,21 @@ private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String back
         return command.toString();
     }
 
+    private String buildRbdImportCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" import ").append(backupPath).append(" ").append(volumePath);
+        return command.toString();
+    }
+
     private String formatRbdMonHosts(String hosts, int port) {
         String[] hostValues = hosts.split(",");
         List<String> formattedHosts = new ArrayList<>();

From 04568fdc652f65d0a4e3f4facf0e5a1b65f6b55b Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 12:16:46 +0900
Subject: [PATCH 34/93] =?UTF-8?q?=EC=9E=AC=EB=B3=B5=EC=9B=90=EC=8B=9C=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tCommvaultRestoreBackupCommandWrapper.java | 36 ++++++++++++++-----
 .../LibvirtRestoreBackupCommandWrapper.java   | 36 ++++++++++++++-----
 2 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index c55041747bb1..d3c6fe5efec3 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -335,15 +335,16 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
 
         String backupPath = getFirstExistingBackupPath(backupPaths);
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, volumeStoragePool);
         if (getBackupFileFormat(backupPath) == QemuImg.PhysicalDiskFormat.RAW) {
-            return importRawBackupToRbd(volumeStoragePool, volumePath, backupPath, timeout, createTargetVolume);
+            return importRawBackupToRbd(volumeStoragePool, normalizedVolumePath, backupPath, timeout, createTargetVolume);
         }
 
         QemuImg qemu;
         try {
             qemu = new QemuImg(timeout * 1000, true, false);
             if (!createTargetVolume) {
-                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(volumePath);
+                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(normalizedVolumePath);
                 logger.debug("Restoring RBD volume: {}", rdbDisk.toString());
                 qemu.setSkipTargetVolumeCreation(true);
             }
@@ -355,12 +356,12 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         QemuImgFile destVolumeFile = null;
         try {
             srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
-            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
+            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, normalizedVolumePath);
             destVolumeFile = new QemuImgFile(rbdDestVolumeFile, QemuImg.PhysicalDiskFormat.RAW);
 
-            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, volumePath);
+            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, normalizedVolumePath);
             qemu.convert(srcBackupFile, destVolumeFile);
-            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, volumePath);
+            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, normalizedVolumePath);
         } catch (QemuImgException | LibvirtException e) {
             String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
             String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
@@ -391,7 +392,8 @@ private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePo
             throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
         }
 
-        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
+        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid()));
+        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, normalizedVolumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
             return false;
         }
 
@@ -401,15 +403,33 @@ private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePo
             if (!backupPath.endsWith(".rbdiff")) {
                 continue;
             }
-            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, volumePath);
+            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
             if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                logger.error("Failed to import RBD diff {} into volume {}", backupPath, volumePath);
+                logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
                 return false;
             }
         }
         return true;
     }
 
+    private String normalizeRbdVolumePath(String volumePath, KVMStoragePool storagePool) {
+        if (StringUtils.isBlank(volumePath)) {
+            return volumePath;
+        }
+        String normalized = volumePath;
+        String poolPath = storagePool.getSourceDir();
+        if (StringUtils.isNotBlank(poolPath)) {
+            String poolPrefix = poolPath + "/";
+            if (normalized.startsWith(poolPrefix)) {
+                normalized = normalized.substring(poolPrefix.length());
+            }
+        }
+        if (normalized.startsWith("/")) {
+            normalized = normalized.substring(normalized.lastIndexOf('/') + 1);
+        }
+        return normalized;
+    }
+
     private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
         StringBuilder command = new StringBuilder("rbd");
         if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 4d4f1daefbc1..1a874ec890a6 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -363,15 +363,16 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
 
         String backupPath = getFirstExistingBackupPath(backupPaths);
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, volumeStoragePool);
         if (getBackupFileFormat(backupPath) == QemuImg.PhysicalDiskFormat.RAW) {
-            return importRawBackupToRbd(volumeStoragePool, volumePath, backupPath, timeout, createTargetVolume);
+            return importRawBackupToRbd(volumeStoragePool, normalizedVolumePath, backupPath, timeout, createTargetVolume);
         }
 
         QemuImg qemu;
         try {
             qemu = new QemuImg(timeout * 1000, true, false);
             if (!createTargetVolume) {
-                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(volumePath);
+                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(normalizedVolumePath);
                 logger.debug("Restoring RBD volume: {}", rdbDisk.toString());
                 qemu.setSkipTargetVolumeCreation(true);
             }
@@ -383,12 +384,12 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         QemuImgFile destVolumeFile = null;
         try {
             srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
-            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
+            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, normalizedVolumePath);
             destVolumeFile = new QemuImgFile(rbdDestVolumeFile, QemuImg.PhysicalDiskFormat.RAW);
 
-            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, volumePath);
+            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, normalizedVolumePath);
             qemu.convert(srcBackupFile, destVolumeFile);
-            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, volumePath);
+            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, normalizedVolumePath);
         } catch (QemuImgException | LibvirtException e) {
             String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
             String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
@@ -419,7 +420,8 @@ private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePo
             throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
         }
 
-        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
+        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid()));
+        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, normalizedVolumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
             return false;
         }
 
@@ -429,15 +431,33 @@ private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePo
             if (!backupPath.endsWith(".rbdiff")) {
                 continue;
             }
-            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, volumePath);
+            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
             if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                logger.error("Failed to import RBD diff {} into volume {}", backupPath, volumePath);
+                logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
                 return false;
             }
         }
         return true;
     }
 
+    private String normalizeRbdVolumePath(String volumePath, KVMStoragePool storagePool) {
+        if (StringUtils.isBlank(volumePath)) {
+            return volumePath;
+        }
+        String normalized = volumePath;
+        String poolPath = storagePool.getSourceDir();
+        if (StringUtils.isNotBlank(poolPath)) {
+            String poolPrefix = poolPath + "/";
+            if (normalized.startsWith(poolPrefix)) {
+                normalized = normalized.substring(poolPrefix.length());
+            }
+        }
+        if (normalized.startsWith("/")) {
+            normalized = normalized.substring(normalized.lastIndexOf('/') + 1);
+        }
+        return normalized;
+    }
+
     private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
         StringBuilder command = new StringBuilder("rbd");
         if (StringUtils.isNotBlank(storagePool.getSourceHost())) {

From 17359f6c0dd5026d42394eaa2d7b52825b75e4c6 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 14:12:01 +0900
Subject: [PATCH 35/93] =?UTF-8?q?=EB=B3=BC=EB=A5=A8=20=EB=B3=B5=EC=9B=90?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=97=B0=EA=B2=B0=EC=8B=9C=20=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/apache/cloudstack/backup/NASBackupProvider.java     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 0320da2f945d..8e0e2302178f 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -691,7 +691,13 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
             }
         }
         final StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
+        if (pool == null) {
+            pool = primaryDataStoreDao.findByName(dataStoreUuid);
+        }
         final HostVO hostVO = hostDao.findByIp(hostIp);
+        if (hostVO == null) {
+            hostVO = hostDao.findByName(hostIp);
+        }
 
         Backup.VolumeInfo matchingVolume = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volume.getUuid());
         if (matchingVolume == null) {

From f51db158107710f05144a4838fd3525215611e56 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 14:19:55 +0900
Subject: [PATCH 36/93] Update NASBackupProvider.java

---
 .../java/org/apache/cloudstack/backup/NASBackupProvider.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 8e0e2302178f..a1db308dbf54 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -690,11 +690,11 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 cacheMode = baseDiskOffering.getCacheMode().toString();
             }
         }
-        final StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
+        StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
         if (pool == null) {
             pool = primaryDataStoreDao.findByName(dataStoreUuid);
         }
-        final HostVO hostVO = hostDao.findByIp(hostIp);
+        HostVO hostVO = hostDao.findByIp(hostIp);
         if (hostVO == null) {
             hostVO = hostDao.findByName(hostIp);
         }

From 22b3e900fc86ad4f2eaa2aacae4c78593515838d Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 14:31:10 +0900
Subject: [PATCH 37/93] Update NASBackupProvider.java

---
 .../java/org/apache/cloudstack/backup/NASBackupProvider.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index a1db308dbf54..7f37fd4bf8f8 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -692,7 +692,8 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         }
         StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
         if (pool == null) {
-            pool = primaryDataStoreDao.findByName(dataStoreUuid);
+            List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(dataStoreUuid);
+            pool = pools.get(0);
         }
         HostVO hostVO = hostDao.findByIp(hostIp);
         if (hostVO == null) {

From b7f9614b12b64aeccf8d95f6b91da29d20c29024 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 14:54:28 +0900
Subject: [PATCH 38/93] Update LibvirtRestoreBackupCommandWrapper.java

---
 .../resource/wrapper/LibvirtRestoreBackupCommandWrapper.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 1a874ec890a6..72997d7c249a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -154,7 +154,7 @@ private void restoreVolume(String backupPath, String backupRepoType, String back
         try {
             List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
             if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
-                    String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), 0)) {
+                    String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), 0, true)) {
                 throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
             }
             if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {

From 23ad6cf28ee1f13c4ebcfd874b1f686fe254f3ea Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 3 Apr 2026 15:55:38 +0900
Subject: [PATCH 39/93] =?UTF-8?q?UI=20=EB=B9=8C=EB=93=9C=EC=98=A4=EB=A5=98?=
 =?UTF-8?q?=20=EB=B0=8F=20=EB=B0=B1=EC=97=85=EC=97=90=EC=84=9C=20=EC=83=88?=
 =?UTF-8?q?=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EC=83=9D=EC=84=B1=20?=
 =?UTF-8?q?=EC=8B=9C=20=EB=84=A4=ED=8A=B8=EC=9B=8C=ED=81=AC=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=20=EC=84=A0=ED=83=9D=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/view/SearchFilter.vue              | 10 +++++-----
 ui/src/views/compute/wizard/NetworkConfiguration.vue |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/view/SearchFilter.vue b/ui/src/components/view/SearchFilter.vue
index 34ca438b5c5b..1b38ae6820d9 100644
--- a/ui/src/components/view/SearchFilter.vue
+++ b/ui/src/components/view/SearchFilter.vue
@@ -56,7 +56,7 @@
 
 <script>
 
-import { api } from '@/api/index'
+import { getAPI } from '@/api'
 
 export default {
   name: 'SearchFilter',
@@ -298,7 +298,7 @@ export default {
     },
     getHypervisor (value) {
       return new Promise((resolve) => {
-        api('listHypervisors').then(json => {
+        getAPI('listHypervisors').then(json => {
           if (json?.listhypervisorsresponse?.hypervisor) {
             for (const key in json.listhypervisorsresponse.hypervisor) {
               const hypervisor = json.listhypervisorsresponse.hypervisor[key]
@@ -318,7 +318,7 @@ export default {
         if (!this.$isValidUuid(id)) {
           return resolve('')
         }
-        api(apiName, { listAll: true, id: id }).then(json => {
+        getAPI(apiName, { listAll: true, id: id }).then(json => {
           const items = json && json[responseKey1] && json[responseKey1][responseKey2]
           if (Array.isArray(items) && items.length > 0 && items[0] && items[0][field] !== undefined) {
             resolve(items[0][field])
@@ -339,7 +339,7 @@ export default {
     },
     getAlertType (type) {
       return new Promise((resolve) => {
-        api('listAlertTypes').then(json => {
+        getAPI('listAlertTypes').then(json => {
           const alertTypes = {}
           for (const key in json.listalerttypesresponse.alerttype) {
             const alerttype = json.listalerttypesresponse.alerttype[key]
@@ -353,7 +353,7 @@ export default {
     },
     getAffinityGroupType (type) {
       return new Promise((resolve) => {
-        api('listAffinityGroupTypes').then(json => {
+        getAPI('listAffinityGroupTypes').then(json => {
           const alertTypes = {}
           for (const key in json.listaffinitygrouptypesresponse.affinityGroupType) {
             const affinityGroupType = json.listaffinitygrouptypesresponse.affinityGroupType[key]
diff --git a/ui/src/views/compute/wizard/NetworkConfiguration.vue b/ui/src/views/compute/wizard/NetworkConfiguration.vue
index a125af394a00..88e099c0e795 100644
--- a/ui/src/views/compute/wizard/NetworkConfiguration.vue
+++ b/ui/src/views/compute/wizard/NetworkConfiguration.vue
@@ -31,6 +31,7 @@
       :dataSource="dataItems"
       :pagination="false"
       :rowSelection="rowSelection"
+      :customRow="onClickRow"
       :rowKey="record => record.id"
       size="middle"
       :scroll="{ y: 225 }">

From c920790d97e76e2994c4dd05d52fac2fc422eec7 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 09:53:07 +0900
Subject: [PATCH 40/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=83=88=20=EC=9D=B8=EC=8A=A4=ED=84=B4=EC=8A=A4=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1=EC=8B=9C=20=EB=84=A4=ED=8A=B8=EC=9B=8C=ED=81=AC=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/view/DeployVMFromBackup.vue | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/ui/src/components/view/DeployVMFromBackup.vue b/ui/src/components/view/DeployVMFromBackup.vue
index b5769c3913a0..98d4c25f1e26 100644
--- a/ui/src/components/view/DeployVMFromBackup.vue
+++ b/ui/src/components/view/DeployVMFromBackup.vue
@@ -475,6 +475,7 @@
                     </div>
                     <div v-show="!(vm.templateid && templateNics && templateNics.length > 0)" >
                       <network-selection
+                        :key="`network-selection-${zoneId}-${tabKey}-${form.templateid || 'no-template'}-${form.isoid || 'no-iso'}-${networkOfferingIds.join(',')}`"
                         :items="options.networks"
                         :row-count="rowCount.networks"
                         :value="networkOfferingIds"
@@ -486,7 +487,9 @@
                       ></network-selection>
                       <network-configuration
                         v-if="networks.length > 0"
+                        :key="`network-config-${zoneId}-${tabKey}-${defaultnetworkid}-${networkOfferingIds.join(',')}`"
                         :items="networks"
+                        :value="defaultnetworkid"
                         :preFillContent="dataPreFill"
                         @update-network-config="($event) => updateNetworkConfig($event)"
                         @handler-error="($event) => hasError = $event"
@@ -945,6 +948,7 @@ export default {
       ],
       initDataConfig: {},
       defaultnetworkid: '',
+      hasInitializedDefaultNetworkSelection: false,
       networkConfig: [],
       dataNetworkCreated: [],
       dataPreFill: {},
@@ -1660,6 +1664,12 @@ export default {
       const param = this.params.networks
       this.fetchOptions(param, 'networks')
     },
+    resetDefaultNetworkSelectionState () {
+      this.defaultnetworkid = ''
+      this.hasInitializedDefaultNetworkSelection = false
+      this.networkConfig = []
+      this.form.defaultnetworkid = undefined
+    },
     resetData () {
       this.vm = {
         name: null,
@@ -1681,11 +1691,13 @@ export default {
         disksize: null
       }
       this.zoneSelected = false
+      this.hasInitializedDefaultNetworkSelection = false
       this.formRef.value.resetFields()
       this.fetchData()
     },
     updateFieldValue (name, value) {
       if (name === 'templateid') {
+        this.resetDefaultNetworkSelectionState()
         this.tabKey = 'templateid'
         this.form.templateid = value
         this.form.isoid = null
@@ -1723,6 +1735,7 @@ export default {
           }
         }
       } else if (name === 'isoid') {
+        this.resetDefaultNetworkSelectionState()
         this.templateConfigurations = []
         this.selectedTemplateConfiguration = {}
         this.templateNics = []
@@ -1776,10 +1789,36 @@ export default {
     },
     updateNetworks (ids) {
       this.form.networkids = ids
+      this.networks = this.getSelectedNetworksWithExistingConfig(
+        _.filter(this.options.networks, (option) => _.includes(ids, option.id))
+      )
+      if (!this.hasInitializedDefaultNetworkSelection && ids && ids.length > 0 && !this.defaultnetworkid) {
+        this.hasInitializedDefaultNetworkSelection = true
+        this.updateDefaultNetworks(ids[0])
+        return
+      }
+      if (!ids || ids.length === 0 || !ids.includes(this.defaultnetworkid)) {
+        this.updateDefaultNetworks('')
+      }
     },
     updateDefaultNetworks (id) {
       this.defaultnetworkid = id
       this.form.defaultnetworkid = id
+
+      if (!id) {
+        return
+      }
+
+      const existingIds = Array.isArray(this.form.networkids) ? [...this.form.networkids] : []
+
+      if (!existingIds.includes(id)) {
+        existingIds.unshift(id)
+        this.form.networkids = existingIds
+      }
+
+      this.networks = this.getSelectedNetworksWithExistingConfig(
+        _.filter(this.options.networks, option => _.includes(this.form.networkids, option.id))
+      )
     },
     updateNetworkConfig (networks) {
       this.networkConfig = networks
@@ -2289,8 +2328,16 @@ export default {
     },
     onTabChange (key, type) {
       this[type] = key
+      this.resetDefaultNetworkSelectionState()
+
       if (key === 'isoid') {
         this.fetchAllIsos()
+      } else if (key === 'templateid') {
+        this.fetchAllTemplates()
+      }
+
+      if (this.form.networkids && this.form.networkids.length > 0) {
+        this.updateNetworks(this.form.networkids)
       }
     },
     fetchIsos (isoFilter, params) {

From d6e30829cfdd9ca8f8cd654a0cb627f587e1a1f0 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 11:28:38 +0900
Subject: [PATCH 41/93] =?UTF-8?q?=EC=89=98=20=EC=8A=A4=ED=81=AC=EB=A6=BD?=
 =?UTF-8?q?=ED=8A=B8=20->=20java=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/LibvirtCommvaultBackupHelper.java | 347 ++++++++++++++
 ...virtCommvaultTakeBackupCommandWrapper.java |  59 +--
 .../wrapper/LibvirtNasBackupHelper.java       | 450 ++++++++++++++++++
 .../LibvirtTakeBackupCommandWrapper.java      |  80 +---
 4 files changed, 805 insertions(+), 131 deletions(-)
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
new file mode 100644
index 000000000000..2c4d81151ab5
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
@@ -0,0 +1,347 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.storage.Storage;
+import com.cloud.utils.Pair;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.CommvaultTakeBackupCommand;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.DomainInfo.DomainState;
+import org.libvirt.LibvirtException;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+class LibvirtCommvaultBackupHelper {
+    static final Integer EXIT_CLEANUP_FAILED = 20;
+    private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
+
+    enum BackupExecutionMode {
+        RUNNING("backup-running"),
+        STOPPED("backup-stopped"),
+        RBD("backup-rbd");
+
+        private final String scriptOperation;
+
+        BackupExecutionMode(String scriptOperation) {
+            this.scriptOperation = scriptOperation;
+        }
+
+        String getScriptOperation() {
+            return scriptOperation;
+        }
+    }
+
+    private final LibvirtComputingResource resource;
+
+    LibvirtCommvaultBackupHelper(LibvirtComputingResource resource) {
+        this.resource = resource;
+    }
+
+    Pair<Integer, String> executeBackup(CommvaultTakeBackupCommand command) {
+        List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
+        BackupExecutionMode executionMode = determineExecutionMode(command.getVmName(), command.getVolumePools());
+        if (BackupExecutionMode.STOPPED.equals(executionMode)) {
+            return executeStoppedVmBackup(command, diskPaths);
+        }
+
+        List<String[]> commands = new ArrayList<>();
+        commands.add(buildBackupScriptCommand(command, diskPaths, executionMode));
+        return Script.executePipedCommands(commands, resource.getCmdsTimeout());
+    }
+
+    List<String> resolveDiskPaths(List<PrimaryDataStoreTO> volumePools, List<String> volumePaths) {
+        List<String> diskPaths = new ArrayList<>();
+        if (volumePaths == null) {
+            return diskPaths;
+        }
+
+        KVMStoragePoolManager storagePoolMgr = resource.getStoragePoolMgr();
+        for (int idx = 0; idx < volumePaths.size(); idx++) {
+            PrimaryDataStoreTO volumePool = volumePools.get(idx);
+            String volumePath = volumePaths.get(idx);
+            if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
+                diskPaths.add(volumePath);
+                continue;
+            }
+
+            KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+            diskPaths.add(KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath));
+        }
+        return diskPaths;
+    }
+
+    private String[] buildBackupScriptCommand(CommvaultTakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
+        return new String[] {
+                resource.getCvtBackupPath(),
+                "-o", executionMode.getScriptOperation(),
+                "-v", command.getVmName(),
+                "-p", command.getBackupPath(),
+                "-b", Objects.nonNull(command.getBackupType()) ? command.getBackupType() : "",
+                "-c", Objects.nonNull(command.getCheckpointName()) ? command.getCheckpointName() : "",
+                "-r", Objects.nonNull(command.getParentBackupPath()) ? command.getParentBackupPath() : "",
+                "-i", Objects.nonNull(command.getParentCheckpointName()) ? command.getParentCheckpointName() : "",
+                "-j", Objects.nonNull(command.getParentCheckpointPath()) ? command.getParentCheckpointPath() : "",
+                "-f", command.getBackupFiles() == null || command.getBackupFiles().isEmpty() ? "" : String.join(",", command.getBackupFiles()),
+                "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
+                "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
+        };
+    }
+
+    private BackupExecutionMode determineExecutionMode(String vmName, List<PrimaryDataStoreTO> volumePools) {
+        if (volumePools != null && volumePools.stream().anyMatch(pool -> pool != null && pool.getPoolType() == Storage.StoragePoolType.RBD)) {
+            return BackupExecutionMode.RBD;
+        }
+        return isVmRunning(vmName) ? BackupExecutionMode.RUNNING : BackupExecutionMode.STOPPED;
+    }
+
+    private boolean isVmRunning(String vmName) {
+        try {
+            Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
+            Domain domain = resource.getDomain(conn, vmName);
+            return domain != null && DomainState.VIR_DOMAIN_RUNNING.equals(domain.getInfo().state);
+        } catch (LibvirtException e) {
+            return false;
+        }
+    }
+
+    private Pair<Integer, String> executeStoppedVmBackup(CommvaultTakeBackupCommand command, List<String> diskPaths) {
+        String dummyVmName = String.format("DUMMY-VM-%s", command.getCheckpointName().replace('.', '-'));
+        Path dest = Path.of(command.getBackupPath());
+        Connect conn = null;
+        try {
+            validateStoppedBackupDiskPaths(diskPaths);
+            if (isIncremental(command)) {
+                resource.validateLibvirtAndQemuVersionForIncrementalSnapshots();
+            }
+            Files.createDirectories(dest.resolve("checkpoints"));
+
+            conn = LibvirtConnection.getConnection();
+            String dummyVmXml = buildDummyVmXml(dummyVmName, diskPaths);
+            resource.startVM(conn, dummyVmName, dummyVmXml, Domain.CreateFlags.PAUSED);
+
+            if (isIncremental(command) && command.getParentCheckpointPath() != null && !command.getParentCheckpointPath().isEmpty()) {
+                redefineCheckpointIfNeeded(dummyVmName, Path.of(command.getParentCheckpointPath()));
+            }
+
+            List<String> diskLabels = getDiskLabels(conn, dummyVmName);
+            Path backupXml = writeBackupXml(dest, command, diskLabels);
+            Path checkpointXml = writeCheckpointXml(dest, command, diskLabels);
+
+            String backupBeginCommand = String.format("virsh -c qemu:///system backup-begin --domain %s --backupxml %s --checkpointxml %s",
+                    shellQuote(dummyVmName), shellQuote(backupXml.toString()), shellQuote(checkpointXml.toString()));
+            if (Script.runSimpleBashScriptForExitValue(backupBeginCommand, resource.getCmdsTimeout(), false) != 0) {
+                return new Pair<>(1, "Failed to start backup for dummy VM " + dummyVmName);
+            }
+
+            try {
+                waitForBackup(dummyVmName);
+            } catch (IOException e) {
+                cancelBackupJob(dummyVmName);
+                throw e;
+            }
+
+            if (isIncremental(command) && command.getParentBackupPath() != null && !command.getParentBackupPath().isEmpty()) {
+                rebaseIncrementalChain(dest, command, diskPaths);
+            }
+
+            dumpCheckpointXml(dummyVmName, command.getCheckpointName(), dest);
+            Files.deleteIfExists(backupXml);
+            Files.deleteIfExists(checkpointXml);
+            Script.runSimpleBashScriptForExitValue("sync", resource.getCmdsTimeout(), false);
+            return new Pair<>(0, "success");
+        } catch (Exception e) {
+            return new Pair<>(1, e.getMessage());
+        } finally {
+            cleanupDummyVm(dummyVmName);
+        }
+    }
+
+    private String buildDummyVmXml(String vmName, List<String> diskPaths) {
+        String arch = resource.getGuestCpuArch() != null ? resource.getGuestCpuArch() : "x86_64";
+        String machine = resource.isGuestAarch64() ? LibvirtComputingResource.VIRT : LibvirtComputingResource.PC;
+        String emulator = resource.getHypervisorPath();
+        StringBuilder xml = new StringBuilder();
+        xml.append("<domain type='qemu'>")
+                .append("<name>").append(vmName).append("</name>")
+                .append("<memory unit='MiB'>256</memory>")
+                .append("<currentMemory unit='MiB'>256</currentMemory>")
+                .append("<vcpu placement='static'>1</vcpu>")
+                .append("<os><type arch='").append(arch).append("' machine='").append(machine).append("'>hvm</type><boot dev='hd'/></os>")
+                .append("<devices><emulator>").append(emulator).append("</emulator>");
+        for (int i = 0; i < diskPaths.size(); i++) {
+            char letter = (char) ('a' + i);
+            String diskPath = diskPaths.get(i);
+            xml.append("<disk type='file' device='disk'>")
+                    .append("<driver name='qemu' type='qcow2'/>")
+                    .append("<source file='").append(diskPath).append("'/>")
+                    .append("<target dev='vd").append(letter).append("' bus='virtio'/></disk>");
+        }
+        xml.append("<console type='pty'/><graphics type='vnc' port='-1'/></devices></domain>");
+        return xml.toString();
+    }
+
+    private void validateStoppedBackupDiskPaths(List<String> diskPaths) {
+        if (diskPaths.stream().anyMatch(path -> path != null && path.startsWith("rbd:"))) {
+            throw new IllegalArgumentException("Stopped VM dummy backup flow supports only file-backed disks. RBD backups must use the dedicated RBD backup path.");
+        }
+    }
+
+    private void redefineCheckpointIfNeeded(String vmName, Path checkpointPath) throws IOException {
+        if (!Files.exists(checkpointPath)) {
+            return;
+        }
+        String checkpointName = checkpointPath.getFileName().toString().replace(".xml", "");
+        int infoExit = Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system checkpoint-info --domain %s --checkpointname %s > /dev/null 2>&1",
+                shellQuote(vmName), shellQuote(checkpointName)));
+        if (infoExit == 0) {
+            return;
+        }
+        int redefineExit = Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system checkpoint-create --domain %s --xmlfile %s --redefine > /dev/null 2>&1",
+                shellQuote(vmName), shellQuote(checkpointPath.toString())));
+        if (redefineExit != 0) {
+            throw new IOException("Failed to redefine checkpoint " + checkpointName + " on domain " + vmName);
+        }
+    }
+
+    private List<String> getDiskLabels(Connect conn, String vmName) {
+        return resource.getDisks(conn, vmName).stream()
+                .map(d -> d.getDiskLabel())
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    private Path writeBackupXml(Path dest, CommvaultTakeBackupCommand command, List<String> diskLabels) throws IOException {
+        StringBuilder xml = new StringBuilder("<domainbackup mode='push'><disks>");
+        for (int i = 0; i < diskLabels.size(); i++) {
+            String backupFile = getBackupFileByIndex(command, i, String.format("volume-%d.qcow2", i));
+            xml.append("<disk name='").append(diskLabels.get(i)).append("' backup='yes' type='file' backupmode='full'>")
+                    .append("<driver type='qcow2'/><target file='").append(dest.resolve(backupFile)).append("'/>");
+            if (isIncremental(command) && command.getParentCheckpointName() != null && !command.getParentCheckpointName().isEmpty()) {
+                xml.append("<incremental>").append(command.getParentCheckpointName()).append("</incremental>");
+            }
+            xml.append("</disk>");
+        }
+        xml.append("</disks></domainbackup>");
+        Path backupXml = dest.resolve("backup.xml");
+        Files.writeString(backupXml, xml.toString(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        return backupXml;
+    }
+
+    private Path writeCheckpointXml(Path dest, CommvaultTakeBackupCommand command, List<String> diskLabels) throws IOException {
+        StringBuilder xml = new StringBuilder("<domaincheckpoint><name>").append(command.getCheckpointName()).append("</name><disks>");
+        for (String diskLabel : diskLabels) {
+            xml.append("<disk name='").append(diskLabel).append("' checkpoint='bitmap'/>");
+        }
+        xml.append("</disks></domaincheckpoint>");
+        Path checkpointXml = dest.resolve("checkpoint.xml");
+        Files.writeString(checkpointXml, xml.toString(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        return checkpointXml;
+    }
+
+    private void waitForBackup(String vmName) throws IOException {
+        int timeout = resource.getCmdsTimeout();
+        while (timeout > 0) {
+            String result = checkBackupJob(vmName);
+            if (result != null && result.contains("Completed") && result.contains("Backup")) {
+                return;
+            }
+            if (result != null && result.contains("Failed")) {
+                throw new IOException("Virsh backup job failed for dummy VM " + vmName);
+            }
+            timeout -= BACKUP_JOB_POLL_INTERVAL_MS;
+            try {
+                Thread.sleep(BACKUP_JOB_POLL_INTERVAL_MS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IOException(e);
+            }
+        }
+        throw new IOException("Timed out waiting for backup job of dummy VM " + vmName);
+    }
+
+    private void cancelBackupJob(String vmName) {
+        Script.runSimpleBashScriptForExitValue(String.format("virsh -c qemu:///system domjobabort --domain %s > /dev/null 2>&1", shellQuote(vmName)));
+    }
+
+    private String checkBackupJob(String vmName) {
+        return Script.runSimpleBashScriptWithFullResult(
+                String.format("virsh -c qemu:///system domjobinfo %s --completed --keep-completed", shellQuote(vmName)), 10);
+    }
+
+    private void rebaseIncrementalChain(Path dest, CommvaultTakeBackupCommand command, List<String> diskPaths) throws IOException {
+        for (int i = 0; i < diskPaths.size(); i++) {
+            String backupFile = getBackupFileByIndex(command, i, String.format("volume-%d.qcow2", i));
+            int exit = Script.runSimpleBashScriptForExitValue(String.format(
+                    "qemu-img rebase -u -F qcow2 -b %s %s",
+                    shellQuote(Path.of(command.getParentBackupPath(), backupFile).toString()),
+                    shellQuote(dest.resolve(backupFile).toString())), resource.getCmdsTimeout(), false);
+            if (exit != 0) {
+                throw new IOException("qemu-img rebase failed for " + backupFile);
+            }
+        }
+    }
+
+    private void dumpCheckpointXml(String vmName, String checkpointName, Path dest) {
+        Path checkpointDest = dest.resolve("checkpoints").resolve(checkpointName + ".xml");
+        Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system checkpoint-dumpxml --domain %s --checkpointname %s --no-domain > %s 2>/dev/null",
+                shellQuote(vmName), shellQuote(checkpointName), shellQuote(checkpointDest.toString())));
+    }
+
+    private void cleanupDummyVm(String dummyVmName) {
+        Script.runSimpleBashScriptForExitValue(String.format("virsh -c qemu:///system destroy %s > /dev/null 2>&1 || true", shellQuote(dummyVmName)));
+        Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system undefine %s --nvram > /dev/null 2>&1 || virsh -c qemu:///system undefine %s > /dev/null 2>&1 || true",
+                shellQuote(dummyVmName), shellQuote(dummyVmName)));
+    }
+
+    private boolean isIncremental(CommvaultTakeBackupCommand command) {
+        return "INCREMENTAL".equalsIgnoreCase(command.getBackupType());
+    }
+
+    private String getBackupFileByIndex(CommvaultTakeBackupCommand command, int index, String fallback) {
+        List<String> backupFiles = command.getBackupFiles();
+        if (backupFiles == null || index >= backupFiles.size()) {
+            return fallback;
+        }
+        return backupFiles.get(index);
+    }
+
+    private String shellQuote(String value) {
+        return "'" + value.replace("'", "'\"'\"'") + "'";
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
index 91abe8f86345..0fcded1b9c8b 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
@@ -21,76 +21,23 @@
 
 import com.cloud.agent.api.Answer;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
-import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
-import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
-import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
-import com.cloud.storage.Storage;
 import com.cloud.utils.Pair;
-import com.cloud.utils.script.Script;
 import org.apache.cloudstack.backup.BackupAnswer;
 import org.apache.cloudstack.backup.CommvaultTakeBackupCommand;
-import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
 
 @ResourceWrapper(handles = CommvaultTakeBackupCommand.class)
 public class LibvirtCommvaultTakeBackupCommandWrapper extends CommandWrapper<CommvaultTakeBackupCommand, Answer, LibvirtComputingResource> {
-    private static final Integer EXIT_CLEANUP_FAILED = 20;
     @Override
     public Answer execute(CommvaultTakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
-        final String vmName = command.getVmName();
-        final String backupPath = command.getBackupPath();
-        final String backupType = command.getBackupType();
-        final String checkpointName = command.getCheckpointName();
-        final String parentBackupPath = command.getParentBackupPath();
-        final String parentCheckpointName = command.getParentCheckpointName();
-        final String parentCheckpointPath = command.getParentCheckpointPath();
-        final List<String> backupFiles = command.getBackupFiles();
-        List<PrimaryDataStoreTO> volumePools = command.getVolumePools();
-        final List<String> volumePaths = command.getVolumePaths();
-        KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
-
-        List<String> diskPaths = new ArrayList<>();
-        if (Objects.nonNull(volumePaths)) {
-            for (int idx = 0; idx < volumePaths.size(); idx++) {
-                PrimaryDataStoreTO volumePool = volumePools.get(idx);
-                String volumePath = volumePaths.get(idx);
-                if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-                    diskPaths.add(volumePath);
-                } else {
-                    KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
-                    String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
-                    diskPaths.add(rbdDestVolumeFile);
-                }
-            }
-        }
-
-        List<String[]> commands = new ArrayList<>();
-        commands.add(new String[]{
-                libvirtComputingResource.getCvtBackupPath(),
-                "-o", "backup",
-                "-v", vmName,
-                "-p", backupPath,
-                "-b", Objects.nonNull(backupType) ? backupType : "",
-                "-c", Objects.nonNull(checkpointName) ? checkpointName : "",
-                "-r", Objects.nonNull(parentBackupPath) ? parentBackupPath : "",
-                "-i", Objects.nonNull(parentCheckpointName) ? parentCheckpointName : "",
-                "-j", Objects.nonNull(parentCheckpointPath) ? parentCheckpointPath : "",
-                "-f", backupFiles == null || backupFiles.isEmpty() ? "" : String.join(",", backupFiles),
-                "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
-                "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
-        });
-
-        Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
+        LibvirtCommvaultBackupHelper backupHelper = new LibvirtCommvaultBackupHelper(libvirtComputingResource);
+        Pair<Integer, String> result = backupHelper.executeBackup(command);
 
         if (result.first() != 0) {
             logger.debug("Failed to take VM backup");
             BackupAnswer answer = new BackupAnswer(command, false, null);
-            if (result.first() == EXIT_CLEANUP_FAILED) {
+            if (result.first() == LibvirtCommvaultBackupHelper.EXIT_CLEANUP_FAILED) {
                 logger.debug("Backup cleanup failed");
                 answer.setNeedsCleanup(true);
             }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
new file mode 100644
index 000000000000..85709fff967a
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
@@ -0,0 +1,450 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.amazonaws.util.CollectionUtils;
+import com.cloud.hypervisor.kvm.resource.LibvirtConnection;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.storage.Storage;
+import com.cloud.utils.Pair;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.TakeBackupCommand;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.DomainInfo.DomainState;
+import org.libvirt.LibvirtException;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+class LibvirtNasBackupHelper {
+    static final Integer EXIT_CLEANUP_FAILED = 20;
+    private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
+
+    enum BackupExecutionMode {
+        RUNNING("backup-running"),
+        STOPPED("backup-stopped"),
+        RBD("backup-rbd");
+
+        private final String scriptOperation;
+
+        BackupExecutionMode(String scriptOperation) {
+            this.scriptOperation = scriptOperation;
+        }
+
+        String getScriptOperation() {
+            return scriptOperation;
+        }
+    }
+
+    private final LibvirtComputingResource resource;
+
+    LibvirtNasBackupHelper(LibvirtComputingResource resource) {
+        this.resource = resource;
+    }
+
+    Pair<Integer, String> executeBackup(TakeBackupCommand command) {
+        List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
+        BackupExecutionMode executionMode = determineExecutionMode(command.getVmName(), command.getVolumePools());
+        if (BackupExecutionMode.STOPPED.equals(executionMode)) {
+            return executeStoppedVmBackup(command, diskPaths);
+        }
+        List<String[]> commands = new ArrayList<>();
+        commands.add(buildBackupScriptCommand(command, diskPaths, executionMode));
+        return Script.executePipedCommands(commands, resource.getCmdsTimeout());
+    }
+
+    List<String> resolveDiskPaths(List<PrimaryDataStoreTO> volumePools, List<String> volumePaths) {
+        List<String> diskPaths = new ArrayList<>();
+        if (Objects.isNull(volumePaths)) {
+            return diskPaths;
+        }
+
+        KVMStoragePoolManager storagePoolMgr = resource.getStoragePoolMgr();
+        for (int idx = 0; idx < volumePaths.size(); idx++) {
+            PrimaryDataStoreTO volumePool = volumePools.get(idx);
+            String volumePath = volumePaths.get(idx);
+            if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
+                diskPaths.add(volumePath);
+                continue;
+            }
+
+            KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+            diskPaths.add(KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath));
+        }
+
+        return diskPaths;
+    }
+
+    long parseBackupSize(String output, List<String> diskPaths) {
+        if (CollectionUtils.isNullOrEmpty(diskPaths)) {
+            List<String> outputLines = Arrays.asList(output.trim().split("\n"));
+            if (!outputLines.isEmpty()) {
+                return Long.parseLong(outputLines.get(outputLines.size() - 1).trim());
+            }
+            return 0L;
+        }
+
+        long backupSize = 0L;
+        String[] outputLines = output.trim().split("\n");
+        for (String line : outputLines) {
+            backupSize += Long.parseLong(line.split(" ")[0].trim());
+        }
+        return backupSize;
+    }
+
+    private String[] buildBackupScriptCommand(TakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
+        return new String[] {
+                resource.getNasBackupPath(),
+                "-o", executionMode.getScriptOperation(),
+                "-v", command.getVmName(),
+                "-t", command.getBackupRepoType(),
+                "-s", command.getBackupRepoAddress(),
+                "-m", Objects.nonNull(command.getMountOptions()) ? command.getMountOptions() : "",
+                "-p", command.getBackupPath(),
+                "-b", Objects.nonNull(command.getBackupType()) ? command.getBackupType() : "",
+                "-c", Objects.nonNull(command.getCheckpointName()) ? command.getCheckpointName() : "",
+                "-r", Objects.nonNull(command.getParentBackupPath()) ? command.getParentBackupPath() : "",
+                "-i", Objects.nonNull(command.getParentCheckpointName()) ? command.getParentCheckpointName() : "",
+                "-j", Objects.nonNull(command.getParentCheckpointPath()) ? command.getParentCheckpointPath() : "",
+                "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
+                "-f", CollectionUtils.isNullOrEmpty(command.getBackupFiles()) ? "" : String.join(",", command.getBackupFiles()),
+                "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
+        };
+    }
+
+    private BackupExecutionMode determineExecutionMode(String vmName, List<PrimaryDataStoreTO> volumePools) {
+        if (hasRbdVolumes(volumePools)) {
+            return BackupExecutionMode.RBD;
+        }
+        return isVmRunning(vmName) ? BackupExecutionMode.RUNNING : BackupExecutionMode.STOPPED;
+    }
+
+    private boolean hasRbdVolumes(List<PrimaryDataStoreTO> volumePools) {
+        if (CollectionUtils.isNullOrEmpty(volumePools)) {
+            return false;
+        }
+        return volumePools.stream().anyMatch(pool -> pool != null && pool.getPoolType() == Storage.StoragePoolType.RBD);
+    }
+
+    private boolean isVmRunning(String vmName) {
+        try {
+            Connect conn = LibvirtConnection.getConnectionByVmName(vmName);
+            Domain domain = resource.getDomain(conn, vmName);
+            return domain != null && DomainState.VIR_DOMAIN_RUNNING.equals(domain.getInfo().state);
+        } catch (LibvirtException e) {
+            return false;
+        }
+    }
+
+    private Pair<Integer, String> executeStoppedVmBackup(TakeBackupCommand command, List<String> diskPaths) {
+        Path mountPoint = null;
+        String dummyVmName = String.format("DUMMY-VM-%s", command.getCheckpointName().replace('.', '-'));
+        Connect conn = null;
+        try {
+            validateStoppedBackupDiskPaths(diskPaths);
+            if (isIncremental(command)) {
+                resource.validateLibvirtAndQemuVersionForIncrementalSnapshots();
+            }
+            mountPoint = mountRepository(command);
+            Path dest = mountPoint.resolve(command.getBackupPath());
+            Files.createDirectories(dest.resolve("checkpoints"));
+
+            conn = LibvirtConnection.getConnection();
+            String dummyVmXml = buildDummyVmXml(dummyVmName, diskPaths, conn);
+            resource.startVM(conn, dummyVmName, dummyVmXml, Domain.CreateFlags.PAUSED);
+
+            if (isIncremental(command) && command.getParentCheckpointPath() != null && !command.getParentCheckpointPath().isEmpty()) {
+                redefineCheckpointIfNeeded(dummyVmName, mountPoint.resolve(command.getParentCheckpointPath()));
+            }
+
+            List<String> diskLabels = getDiskLabels(conn, dummyVmName);
+            Path backupXml = writeBackupXml(dest, command, diskLabels);
+            Path checkpointXml = writeCheckpointXml(dest, command, diskLabels);
+
+            String backupBeginCommand = String.format("virsh -c qemu:///system backup-begin --domain %s --backupxml %s --checkpointxml %s",
+                    shellQuote(dummyVmName), shellQuote(backupXml.toString()), shellQuote(checkpointXml.toString()));
+            if (Script.runSimpleBashScriptForExitValue(backupBeginCommand, resource.getCmdsTimeout(), false) != 0) {
+                return new Pair<>(1, "Failed to start backup for dummy VM " + dummyVmName);
+            }
+
+            try {
+                waitForBackup(dummyVmName);
+            } catch (IOException e) {
+                cancelBackupJob(dummyVmName);
+                throw e;
+            }
+
+            if (isIncremental(command) && command.getParentBackupPath() != null && !command.getParentBackupPath().isEmpty()) {
+                rebaseIncrementalChain(dest, command, diskPaths);
+            }
+
+            dumpCheckpointXml(dummyVmName, command.getCheckpointName(), dest);
+            backupDomainInformation(dummyVmName, dest, command, diskPaths);
+
+            Files.deleteIfExists(backupXml);
+            Files.deleteIfExists(checkpointXml);
+            runCommand(String.format("sync"));
+            String output = listTopLevelFileSizes(dest);
+            return new Pair<>(0, output);
+        } catch (Exception e) {
+            return new Pair<>(1, e.getMessage());
+        } finally {
+            cleanupDummyVm(dummyVmName);
+            unmountRepository(mountPoint);
+        }
+    }
+
+    private Path mountRepository(TakeBackupCommand command) throws IOException {
+        Path mountPoint = Files.createTempDirectory("csbackup.");
+        StringBuilder mount = new StringBuilder()
+                .append("mount -t ").append(shellQuote(command.getBackupRepoType()))
+                .append(" ").append(shellQuote(command.getBackupRepoAddress()))
+                .append(" ").append(shellQuote(mountPoint.toString()));
+        if (command.getMountOptions() != null && !command.getMountOptions().isEmpty()) {
+            mount.append(" -o ").append(shellQuote(command.getMountOptions()));
+        }
+        if (Script.runSimpleBashScriptForExitValue(mount.toString(), resource.getCmdsTimeout(), false) != 0) {
+            throw new IOException("Failed to mount backup repository");
+        }
+        return mountPoint;
+    }
+
+    private void unmountRepository(Path mountPoint) {
+        if (mountPoint == null) {
+            return;
+        }
+        Script.runSimpleBashScriptForExitValue(String.format("umount %s", shellQuote(mountPoint.toString())));
+        try {
+            Files.deleteIfExists(mountPoint);
+        } catch (IOException ignored) {
+        }
+    }
+
+    private String buildDummyVmXml(String vmName, List<String> diskPaths, Connect conn) throws LibvirtException {
+        String arch = resource.getGuestCpuArch() != null ? resource.getGuestCpuArch() : "x86_64";
+        String machine = resource.isGuestAarch64() ? LibvirtComputingResource.VIRT : LibvirtComputingResource.PC;
+        String emulator = resource.getHypervisorPath();
+        StringBuilder xml = new StringBuilder();
+        xml.append("<domain type='qemu'>")
+                .append("<name>").append(vmName).append("</name>")
+                .append("<memory unit='MiB'>128</memory>")
+                .append("<vcpu>1</vcpu>")
+                .append("<os><type arch='").append(arch).append("' machine='").append(machine).append("'>hvm</type></os>")
+                .append("<devices><emulator>").append(emulator).append("</emulator>");
+        for (int i = 0; i < diskPaths.size(); i++) {
+            char letter = (char) ('a' + i);
+            xml.append("<disk type='file' device='disk'>")
+                    .append("<source file='").append(diskPaths.get(i)).append("'/>")
+                    .append("<target dev='vd").append(letter).append("' bus='virtio'/>")
+                    .append("</disk>");
+        }
+        xml.append("</devices></domain>");
+        return xml.toString();
+    }
+
+    private void validateStoppedBackupDiskPaths(List<String> diskPaths) {
+        if (diskPaths.stream().anyMatch(path -> path != null && path.startsWith("rbd:"))) {
+            throw new IllegalArgumentException("Stopped VM dummy backup flow supports only file-backed disks. RBD backups must use the dedicated RBD backup path.");
+        }
+    }
+
+    private void redefineCheckpointIfNeeded(String vmName, Path checkpointPath) throws IOException {
+        if (!Files.exists(checkpointPath)) {
+            return;
+        }
+        String checkpointName = checkpointPath.getFileName().toString().replace(".xml", "");
+        int infoExit = Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system checkpoint-info --domain %s --checkpointname %s > /dev/null 2>&1",
+                shellQuote(vmName), shellQuote(checkpointName)));
+        if (infoExit == 0) {
+            return;
+        }
+        int redefineExit = Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system checkpoint-create --domain %s --xmlfile %s --redefine > /dev/null 2>&1",
+                shellQuote(vmName), shellQuote(checkpointPath.toString())));
+        if (redefineExit != 0) {
+            throw new IOException("Failed to redefine checkpoint " + checkpointName + " on domain " + vmName);
+        }
+    }
+
+    private List<String> getDiskLabels(Connect conn, String vmName) {
+        return resource.getDisks(conn, vmName).stream()
+                .map(disk -> disk.getDiskLabel())
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
+    private Path writeBackupXml(Path dest, TakeBackupCommand command, List<String> diskLabels) throws IOException {
+        StringBuilder xml = new StringBuilder("<domainbackup mode='push'>");
+        if (isIncremental(command) && command.getParentCheckpointName() != null && !command.getParentCheckpointName().isEmpty()) {
+            xml.append("<incremental>").append(command.getParentCheckpointName()).append("</incremental>");
+        }
+        xml.append("<disks>");
+        for (int i = 0; i < diskLabels.size(); i++) {
+            String backupFile = getBackupFileByIndex(command, i, String.format("disk-%d.qcow2", i));
+            xml.append("<disk name='").append(diskLabels.get(i)).append("' backup='yes' type='file'>")
+                    .append("<target file='").append(dest.resolve(backupFile)).append("' />")
+                    .append("<driver type='qcow2'/></disk>");
+        }
+        xml.append("</disks></domainbackup>");
+        Path backupXml = dest.resolve("backup.xml");
+        Files.writeString(backupXml, xml.toString(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        return backupXml;
+    }
+
+    private Path writeCheckpointXml(Path dest, TakeBackupCommand command, List<String> diskLabels) throws IOException {
+        StringBuilder xml = new StringBuilder("<domaincheckpoint><name>")
+                .append(command.getCheckpointName())
+                .append("</name><disks>");
+        for (String diskLabel : diskLabels) {
+            xml.append("<disk name='").append(diskLabel).append("' checkpoint='bitmap'/>");
+        }
+        xml.append("</disks></domaincheckpoint>");
+        Path checkpointXml = dest.resolve("checkpoint.xml");
+        Files.writeString(checkpointXml, xml.toString(), StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        return checkpointXml;
+    }
+
+    private void waitForBackup(String vmName) throws IOException {
+        int timeout = resource.getCmdsTimeout();
+        while (timeout > 0) {
+            String result = checkBackupJob(vmName);
+            if (result != null && result.contains("Completed") && result.contains("Backup")) {
+                return;
+            }
+            if (result != null && result.contains("Failed")) {
+                throw new IOException("Virsh backup job failed for dummy VM " + vmName);
+            }
+            timeout -= BACKUP_JOB_POLL_INTERVAL_MS;
+            try {
+                Thread.sleep(BACKUP_JOB_POLL_INTERVAL_MS);
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new IOException(e);
+            }
+        }
+        throw new IOException("Timed out waiting for backup job of dummy VM " + vmName);
+    }
+
+    private void cancelBackupJob(String vmName) {
+        Script.runSimpleBashScriptForExitValue(String.format("virsh -c qemu:///system domjobabort --domain %s > /dev/null 2>&1", shellQuote(vmName)));
+    }
+
+    private String checkBackupJob(String vmName) {
+        return Script.runSimpleBashScriptWithFullResult(
+                String.format("virsh -c qemu:///system domjobinfo %s --completed --keep-completed", shellQuote(vmName)), 10);
+    }
+
+    private void rebaseIncrementalChain(Path dest, TakeBackupCommand command, List<String> diskPaths) throws IOException {
+        for (int i = 0; i < diskPaths.size(); i++) {
+            String backupFile = getBackupFileByIndex(command, i, String.format("disk-%d.qcow2", i));
+            Path output = dest.resolve(backupFile);
+            String parent = "../" + Path.of(command.getParentBackupPath()).getFileName() + "/" + backupFile;
+            int exit = Script.runSimpleBashScriptForExitValue(String.format(
+                    "qemu-img rebase -u -F qcow2 -b %s %s",
+                    shellQuote(parent), shellQuote(output.toString())), resource.getCmdsTimeout(), false);
+            if (exit != 0) {
+                throw new IOException("qemu-img rebase failed for " + output + " with parent " + parent);
+            }
+        }
+    }
+
+    private void dumpCheckpointXml(String vmName, String checkpointName, Path dest) {
+        Path checkpointDest = dest.resolve("checkpoints").resolve(checkpointName + ".xml");
+        Script.runSimpleBashScriptForExitValue(String.format(
+                "virsh -c qemu:///system checkpoint-dumpxml --domain %s --checkpointname %s --no-domain > %s 2>/dev/null",
+                shellQuote(vmName), shellQuote(checkpointName), shellQuote(checkpointDest.toString())));
+    }
+
+    private void backupDomainInformation(String vmName, Path dest, TakeBackupCommand command, List<String> diskPaths) {
+        runCommand(String.format("virsh -c qemu:///system dumpxml %s > %s 2>/dev/null || true",
+                shellQuote(vmName), shellQuote(dest.resolve("domain-config.xml").toString())));
+        runCommand(String.format("virsh -c qemu:///system dominfo %s > %s 2>/dev/null || true",
+                shellQuote(vmName), shellQuote(dest.resolve("dominfo.xml").toString())));
+        runCommand(String.format("virsh -c qemu:///system domiflist %s > %s 2>/dev/null || true",
+                shellQuote(vmName), shellQuote(dest.resolve("domiflist.xml").toString())));
+        runCommand(String.format("virsh -c qemu:///system domblklist %s > %s 2>/dev/null || true",
+                shellQuote(vmName), shellQuote(dest.resolve("domblklist.xml").toString())));
+        Path checkpointMeta = dest.resolve("checkpoints").resolve(command.getCheckpointName() + ".meta");
+        String metadata = "checkpoint_name=" + command.getCheckpointName() + "\n" +
+                "backup_type=" + command.getBackupType() + "\n" +
+                "vm_name=" + vmName + "\n" +
+                "disk_paths=" + String.join(",", diskPaths) + "\n" +
+                "backup_files=" + String.join(",", Objects.requireNonNullElse(command.getBackupFiles(), List.of())) + "\n";
+        try {
+            Files.writeString(checkpointMeta, metadata, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING);
+        } catch (IOException ignored) {
+        }
+    }
+
+    private String listTopLevelFileSizes(Path dest) throws IOException {
+        try (var stream = Files.list(dest)) {
+            return stream.filter(Files::isRegularFile)
+                    .sorted(Comparator.comparing(path -> path.getFileName().toString()))
+                    .map(path -> {
+                        try {
+                            return String.valueOf(Files.size(path));
+                        } catch (IOException e) {
+                            return "0";
+                        }
+                    })
+                    .collect(Collectors.joining("\n"));
+        }
+    }
+
+    private void cleanupDummyVm(String dummyVmName) {
+        runCommand(String.format("virsh -c qemu:///system destroy %s > /dev/null 2>&1 || true", shellQuote(dummyVmName)));
+        runCommand(String.format("virsh -c qemu:///system undefine %s --nvram > /dev/null 2>&1 || virsh -c qemu:///system undefine %s > /dev/null 2>&1 || true",
+                shellQuote(dummyVmName), shellQuote(dummyVmName)));
+    }
+
+    private void runCommand(String command) {
+        Script.runSimpleBashScriptForExitValue(command, resource.getCmdsTimeout(), false);
+    }
+
+    private boolean isIncremental(TakeBackupCommand command) {
+        return "INCREMENTAL".equalsIgnoreCase(command.getBackupType());
+    }
+
+    private String getBackupFileByIndex(TakeBackupCommand command, int index, String fallback) {
+        List<String> backupFiles = command.getBackupFiles();
+        if (CollectionUtils.isNullOrEmpty(backupFiles) || index >= backupFiles.size()) {
+            return fallback;
+        }
+        return backupFiles.get(index);
+    }
+
+    private String shellQuote(String value) {
+        return "'" + value.replace("'", "'\"'\"'") + "'";
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
index a8d2de1a6cc4..8ba999ee1f6a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
@@ -19,105 +19,35 @@
 
 package com.cloud.hypervisor.kvm.resource.wrapper;
 
-import com.amazonaws.util.CollectionUtils;
 import com.cloud.agent.api.Answer;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
-import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
-import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
-import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
-import com.cloud.storage.Storage;
 import com.cloud.utils.Pair;
-import com.cloud.utils.script.Script;
 import org.apache.cloudstack.backup.BackupAnswer;
 import org.apache.cloudstack.backup.TakeBackupCommand;
-import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
-import java.util.Objects;
 
 @ResourceWrapper(handles = TakeBackupCommand.class)
 public class LibvirtTakeBackupCommandWrapper extends CommandWrapper<TakeBackupCommand, Answer, LibvirtComputingResource> {
-    private static final Integer EXIT_CLEANUP_FAILED = 20;
     @Override
     public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
-        final String vmName = command.getVmName();
-        final String backupPath = command.getBackupPath();
-        final String backupType = command.getBackupType();
-        final String checkpointName = command.getCheckpointName();
-        final String parentBackupPath = command.getParentBackupPath();
-        final String parentCheckpointName = command.getParentCheckpointName();
-        final String parentCheckpointPath = command.getParentCheckpointPath();
-        final String backupRepoType = command.getBackupRepoType();
-        final String backupRepoAddress = command.getBackupRepoAddress();
-        final String mountOptions = command.getMountOptions();
-        List<PrimaryDataStoreTO> volumePools = command.getVolumePools();
-        final List<String> volumePaths = command.getVolumePaths();
-        final List<String> backupFiles = command.getBackupFiles();
-        KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
-
-        List<String> diskPaths = new ArrayList<>();
-        if (Objects.nonNull(volumePaths)) {
-            for (int idx = 0; idx < volumePaths.size(); idx++) {
-                PrimaryDataStoreTO volumePool = volumePools.get(idx);
-                String volumePath = volumePaths.get(idx);
-                if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-                    diskPaths.add(volumePath);
-                } else {
-                    KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
-                    String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
-                    diskPaths.add(rbdDestVolumeFile);
-                }
-            }
-        }
-
-        List<String[]> commands = new ArrayList<>();
-        commands.add(new String[]{
-                libvirtComputingResource.getNasBackupPath(),
-                "-o", "backup",
-                "-v", vmName,
-                "-t", backupRepoType,
-                "-s", backupRepoAddress,
-                "-m", Objects.nonNull(mountOptions) ? mountOptions : "",
-                "-p", backupPath,
-                "-b", Objects.nonNull(backupType) ? backupType : "",
-                "-c", Objects.nonNull(checkpointName) ? checkpointName : "",
-                "-r", Objects.nonNull(parentBackupPath) ? parentBackupPath : "",
-                "-i", Objects.nonNull(parentCheckpointName) ? parentCheckpointName : "",
-                "-j", Objects.nonNull(parentCheckpointPath) ? parentCheckpointPath : "",
-                "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
-                "-f", CollectionUtils.isNullOrEmpty(backupFiles) ? "" : String.join(",", backupFiles),
-                "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
-        });
-
-        Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
+        LibvirtNasBackupHelper backupHelper = new LibvirtNasBackupHelper(libvirtComputingResource);
+        List<String> diskPaths = backupHelper.resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
+        Pair<Integer, String> result = backupHelper.executeBackup(command);
 
         if (result.first() != 0) {
             logger.debug("Failed to take VM backup: " + result.second());
             BackupAnswer answer = new BackupAnswer(command, false, result.second().trim());
-            if (result.first() == EXIT_CLEANUP_FAILED) {
+            if (result.first() == LibvirtNasBackupHelper.EXIT_CLEANUP_FAILED) {
                 logger.debug("Backup cleanup failed");
                 answer.setNeedsCleanup(true);
             }
             return answer;
         }
 
-        long backupSize = 0L;
-        if (CollectionUtils.isNullOrEmpty(diskPaths)) {
-            List<String> outputLines = Arrays.asList(result.second().trim().split("\n"));
-            if (!outputLines.isEmpty()) {
-                backupSize = Long.parseLong(outputLines.get(outputLines.size() - 1).trim());
-            }
-        } else {
-            String[] outputLines = result.second().trim().split("\n");
-            for(String line : outputLines) {
-                backupSize = backupSize + Long.parseLong(line.split(" ")[0].trim());
-            }
-        }
-
+        long backupSize = backupHelper.parseBackupSize(result.second(), diskPaths);
         BackupAnswer answer = new BackupAnswer(command, true, result.second().trim());
         answer.setSize(backupSize);
         return answer;

From d7bd12bf77d0dc805862cfcfec307b621f820438 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 13:18:28 +0900
Subject: [PATCH 42/93] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/cvtbackup.sh | 20 +++++---------------
 scripts/vm/hypervisor/kvm/nasbackup.sh | 15 ++++-----------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 147d015872a9..c35ada07622e 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -481,21 +481,11 @@ fi
 dest="$BACKUP_DIR"
 sanity_checks
 
-if [[ "$OP" != "backup" ]]; then
-  echo "Unsupported operation: $OP"
-  exit 1
-fi
-
-if is_rbd_disk_path "$DISK_PATHS"; then
-  backup_rbd_volumes
-  exit 0
-fi
-
-STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
-if [[ -n "$STATE" && "$STATE" == "running" ]]; then
+if [[ "$OP" == "backup-running" ]]; then
   backup_running_vm
+elif [[ "$OP" == "backup-rbd" ]]; then
+  backup_rbd_volumes
 else
-  backup_stopped_vm
+  echo "Unsupported operation: $OP"
+  exit 1
 fi
-
-exit 0
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 11e63e5a3586..5c073a0a10f3 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -757,17 +757,10 @@ done
 # Perform Initial sanity checks
 sanity_checks
 
-if [ "$OP" = "backup" ]; then
-  if is_rbd_disk_path "$DISK_PATHS"; then
-    backup_rbd_volumes
-  else
-    STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
-    if [ -n "$STATE" ] && [ "$STATE" = "running" ]; then
-      backup_running_vm
-    else
-      backup_stopped_vm
-    fi
-  fi
+if [ "$OP" = "backup-running" ]; then
+  backup_running_vm
+elif [ "$OP" = "backup-rbd" ]; then
+  backup_rbd_volumes
 elif [ "$OP" = "delete" ]; then
   delete_backup
 elif [ "$OP" = "stats" ]; then

From 9872e86eb0aa32489818164b57d84a48bc4a8524 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 13:49:23 +0900
Subject: [PATCH 43/93] =?UTF-8?q?=EC=9E=AC=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/cvtbackup.sh | 142 ------------------------
 scripts/vm/hypervisor/kvm/nasbackup.sh | 147 -------------------------
 2 files changed, 289 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index c35ada07622e..c76060ca5b62 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -13,7 +13,6 @@ PARENT_BACKUP_DIR=""
 PARENT_CHECKPOINT_NAME=""
 PARENT_CHECKPOINT_PATH=""
 BACKUP_FILES=""
-DUMMY_VM=""
 logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
@@ -63,7 +62,6 @@ sanity_checks() {
 
 cleanup() {
   local status=0
-  cleanup_dummy_vm
   rm -rf "$dest" || { echo "Failed to delete $dest"; status=1; }
   if [[ $status -ne 0 ]]; then
     echo "Backup cleanup failed"
@@ -71,15 +69,6 @@ cleanup() {
   fi
 }
 
-cleanup_dummy_vm() {
-  if [[ -z "$DUMMY_VM" ]]; then
-    return
-  fi
-  virsh -c qemu:///system destroy "$DUMMY_VM" > /dev/null 2>&1 || true
-  virsh -c qemu:///system undefine "$DUMMY_VM" --nvram > /dev/null 2>&1 || true
-  DUMMY_VM=""
-}
-
 split_csv() {
   tr ',' '\n' <<< "$1"
 }
@@ -129,92 +118,6 @@ redefine_checkpoint_if_needed() {
   fi
 }
 
-create_dummy_vm_xml() {
-  local dummy_vm="$1"
-  local xml_file="$2"
-  {
-    echo "<domain type='kvm'>"
-    echo "  <name>$dummy_vm</name>"
-    echo "  <memory unit='MiB'>256</memory>"
-    echo "  <currentMemory unit='MiB'>256</currentMemory>"
-    echo "  <vcpu placement='static'>1</vcpu>"
-    echo "  <os><type arch='x86_64' machine='pc'>hvm</type></os>"
-    echo "  <devices>"
-    echo "    <emulator>/usr/bin/qemu-system-x86_64</emulator>"
-  } > "$xml_file"
-
-  local index=0
-  while IFS= read -r disk_path; do
-    [[ -z "$disk_path" ]] && continue
-    local disk_name
-    disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
-    if [[ "$disk_path" == rbd:* ]]; then
-      local source_name="${disk_path#rbd:}"
-      source_name="${source_name%%:mon_host=*}"
-      local mon_hosts="${disk_path#*:mon_host=}"
-      mon_hosts="${mon_hosts%%:*}"
-      {
-        echo "    <disk type='network' device='disk'>"
-        echo "      <driver name='qemu' type='raw'/>"
-        echo "      <source protocol='rbd' name='$source_name'>"
-        IFS=';' read -r -a hosts <<< "$mon_hosts"
-        for host in "${hosts[@]}"; do
-          echo "        <host name='$host'/>"
-        done
-        echo "      </source>"
-        echo "      <target dev='vd$disk_name' bus='virtio'/>"
-        echo "    </disk>"
-      } >> "$xml_file"
-    else
-      {
-        echo "    <disk type='file' device='disk'>"
-        echo "      <driver name='qemu' type='qcow2'/>"
-        echo "      <source file='$disk_path'/>"
-        echo "      <target dev='vd$disk_name' bus='virtio'/>"
-        echo "    </disk>"
-      } >> "$xml_file"
-    fi
-    index=$((index + 1))
-  done < <(split_csv "$DISK_PATHS")
-
-  {
-    echo "    <console type='pty'/>"
-    echo "  </devices>"
-    echo "</domain>"
-  } >> "$xml_file"
-}
-
-create_backup_xml_for_dummy_vm() {
-  local backup_xml="$1"
-  local checkpoint_xml="$2"
-
-  echo "<domainbackup mode='push'><disks>" > "$backup_xml"
-  local index=0
-  while IFS= read -r disk_path; do
-    [[ -z "$disk_path" ]] && continue
-    local disk_name
-    disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
-    local target_file="$dest/$(get_backup_file_by_index "$index" "volume-${index}.qcow2")"
-    echo "<disk name='vd$disk_name' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$target_file'/>" >> "$backup_xml"
-    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$backup_xml"
-    fi
-    echo "</disk>" >> "$backup_xml"
-    index=$((index + 1))
-  done < <(split_csv "$DISK_PATHS")
-  echo "</disks></domainbackup>" >> "$backup_xml"
-
-  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$checkpoint_xml"
-  index=0
-  while IFS= read -r disk_path; do
-    [[ -z "$disk_path" ]] && continue
-    local disk_name
-    disk_name=$(printf "\\$(printf '%03o' $((97 + index)))")
-    echo "<disk name='vd$disk_name' checkpoint='bitmap'/>" >> "$checkpoint_xml"
-    index=$((index + 1))
-  done < <(split_csv "$DISK_PATHS")
-  echo "</disks></domaincheckpoint>" >> "$checkpoint_xml"
-}
 
 parse_rbd_uri() {
   local uri="$1"
@@ -357,51 +260,6 @@ backup_running_vm() {
   sync
 }
 
-backup_stopped_vm() {
-  mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
-  local dummy_vm="DUMMY-VM-${CHECKPOINT_NAME//./-}"
-  DUMMY_VM="$dummy_vm"
-  local dummy_xml="$dest/dummy-vm.xml"
-  local backup_xml="$dest/backup.xml"
-  local checkpoint_xml="$dest/checkpoint.xml"
-
-  create_dummy_vm_xml "$dummy_vm" "$dummy_xml"
-  virsh -c qemu:///system define "$dummy_xml" > /dev/null
-  virsh -c qemu:///system start "$dummy_vm" --paused > /dev/null
-
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
-    redefine_checkpoint_if_needed "$dummy_vm" "$PARENT_CHECKPOINT_PATH"
-  fi
-
-  create_backup_xml_for_dummy_vm "$backup_xml" "$checkpoint_xml"
-  if ! virsh -c qemu:///system backup-begin --domain "$dummy_vm" --backupxml "$backup_xml" --checkpointxml "$checkpoint_xml" > /dev/null 2>&1; then
-    echo "Failed to start backup for dummy VM $dummy_vm"
-    cleanup
-    exit 1
-  fi
-
-  while true; do
-    status=$(virsh -c qemu:///system domjobinfo "$dummy_vm" --completed --keep-completed | awk '/Job type:/ {print $3}')
-    case "$status" in
-      Completed) break ;;
-      Failed) echo "Virsh backup job failed for dummy VM $dummy_vm"; cleanup ;;
-    esac
-    sleep 5
-  done
-
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
-    while IFS= read -r backup_file; do
-      [[ -z "$backup_file" ]] && continue
-      qemu-img rebase -u -F qcow2 -b "$PARENT_BACKUP_DIR/$backup_file" "$dest/$backup_file" > /dev/null 2>&1 || true
-    done < <(split_csv "$BACKUP_FILES")
-  fi
-
-  dump_checkpoint_xml "$dummy_vm"
-  cleanup_dummy_vm
-  rm -f "$backup_xml" "$checkpoint_xml" "$dummy_xml"
-  sync
-}
-
 backup_rbd_volumes() {
   mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
   local index=0
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 5c073a0a10f3..cb6a2c0aa80d 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -39,7 +39,6 @@ PARENT_CHECKPOINT_PATH=""
 BACKUP_FILES=""
 DISK_PATHS=""
 QUIESCE=""
-DUMMY_VM=""
 FORCED="false"
 logFile="/var/log/cloudstack/agent/agent.log"
 
@@ -196,77 +195,6 @@ backup_running_vm() {
   rmdir "$mount_point"
 }
 
-backup_stopped_vm() {
-  if is_rbd_disk_path "$DISK_PATHS"; then
-    backup_rbd_volumes
-    return
-  fi
-
-  mount_operation
-  mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
-  mkdir -p "$dest/checkpoints" || { echo "Failed to create checkpoint directory $dest/checkpoints"; exit 1; }
-
-  local dummy_vm
-  dummy_vm="DUMMY-VM-${CHECKPOINT_NAME//./-}"
-  DUMMY_VM="$dummy_vm"
-  local dummy_xml="$dest/dummy-vm.xml"
-  local checkpoint_xml="$dest/checkpoint.xml"
-  local backup_xml="$dest/backup.xml"
-
-  create_dummy_vm_xml "$dummy_vm" "$dummy_xml"
-  virsh -c qemu:///system define "$dummy_xml" > /dev/null
-  virsh -c qemu:///system start "$dummy_vm" --paused > /dev/null
-
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
-    redefine_checkpoint_if_needed "$dummy_vm" "$mount_point/$PARENT_CHECKPOINT_PATH"
-  fi
-
-  create_backup_xml_for_dummy_vm "$dummy_vm" "$backup_xml" "$checkpoint_xml"
-
-  if ! virsh -c qemu:///system backup-begin --domain "$dummy_vm" --backupxml "$backup_xml" --checkpointxml "$checkpoint_xml" > /dev/null 2>&1; then
-    echo "Failed to start backup for dummy VM $dummy_vm"
-    cleanup
-  fi
-
-  while true; do
-    status=$(virsh -c qemu:///system domjobinfo "$dummy_vm" --completed --keep-completed | awk '/Job type:/ {print $3}')
-    case "$status" in
-      Completed)
-        break ;;
-      Failed)
-        echo "Virsh backup job failed for dummy VM $dummy_vm"
-        cleanup ;;
-    esac
-    sleep 5
-  done
-
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
-    local index=0
-    while IFS= read -r disk; do
-      [[ -z "$disk" ]] && continue
-      local backup_file
-      backup_file=$(get_backup_file_by_index "$index" "$(basename "$disk").qcow2")
-      output="$dest/$backup_file"
-      parent="../$(basename "$PARENT_BACKUP_DIR")/$backup_file"
-      if ! qemu-img rebase -u -F qcow2 -b "$parent" "$output" > "$logFile" 2> >(cat >&2); then
-        echo "qemu-img rebase failed for $output with parent $parent"
-        cleanup
-      fi
-      index=$((index + 1))
-    done < <(split_csv "$DISK_PATHS")
-  fi
-
-  dump_checkpoint_xml "$dummy_vm"
-  cleanup_dummy_vm
-  DUMMY_VM=""
-  rm -f "$backup_xml" "$checkpoint_xml" "$dummy_xml"
-  sync
-
-  find "$dest" -maxdepth 1 -type f -printf '%s\n'
-  umount "$mount_point"
-  rmdir "$mount_point"
-}
-
 backup_rbd_volumes() {
   log -ne "Entered backup_rbd_volumes with DISK_PATHS=[$DISK_PATHS], BACKUP_FILES=[$BACKUP_FILES], BACKUP_DIR=[$BACKUP_DIR]"
   mount_operation
@@ -451,7 +379,6 @@ mount_operation() {
 cleanup() {
   local status=0
 
-  cleanup_dummy_vm
   rm -rf "$dest" || { echo "Failed to delete $dest"; status=1; }
   umount "$mount_point" || { echo "Failed to unmount $mount_point"; status=1; }
   rmdir "$mount_point" || { echo "Failed to remove mount point $mount_point"; status=1; }
@@ -462,13 +389,6 @@ cleanup() {
   fi
 }
 
-cleanup_dummy_vm() {
-  if [[ -n "$DUMMY_VM" ]]; then
-    virsh -c qemu:///system destroy "$DUMMY_VM" > /dev/null 2>&1 || true
-    virsh -c qemu:///system undefine "$DUMMY_VM" --nvram > /dev/null 2>&1 || virsh -c qemu:///system undefine "$DUMMY_VM" > /dev/null 2>&1 || true
-  fi
-}
-
 split_csv() {
   tr ',' '\n' <<< "$1"
 }
@@ -518,73 +438,6 @@ redefine_checkpoint_if_needed() {
   fi
 }
 
-create_dummy_vm_xml() {
-  local vm_name="$1"
-  local output_file="$2"
-  local arch
-  local emulator
-  local machine="pc"
-  arch="$(uname -m)"
-  [[ "$arch" == "aarch64" ]] && machine="virt"
-  emulator="$(command -v qemu-system-${arch})"
-  if [[ -z "$emulator" ]]; then
-    emulator="$(command -v qemu-kvm)"
-  fi
-  if [[ -z "$emulator" ]]; then
-    echo "Unable to find qemu emulator path"
-    cleanup
-  fi
-
-  {
-    echo "<domain type='qemu'>"
-    echo "  <name>${vm_name}</name>"
-    echo "  <memory unit='MiB'>128</memory>"
-    echo "  <vcpu>1</vcpu>"
-    echo "  <os>"
-    echo "    <type arch='${arch}' machine='${machine}'>hvm</type>"
-    echo "  </os>"
-    echo "  <devices>"
-    echo "    <emulator>${emulator}</emulator>"
-    local index=0
-    while IFS= read -r disk; do
-      [[ -z "$disk" ]] && continue
-      local letter
-      letter=$(printf "\\$(printf '%03o' $((97 + index)))")
-      echo "    <disk type='file' device='disk'>"
-      echo "      <source file='${disk}'/>"
-      echo "      <target dev='vd${letter}' bus='virtio'/>"
-      echo "    </disk>"
-      index=$((index + 1))
-    done < <(split_csv "$DISK_PATHS")
-    echo "  </devices>"
-    echo "</domain>"
-  } > "$output_file"
-}
-
-create_backup_xml_for_dummy_vm() {
-  local vm_name="$1"
-  local backup_xml="$2"
-  local checkpoint_xml="$3"
-
-  echo "<domainbackup mode='push'>" > "$backup_xml"
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-    echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$backup_xml"
-  fi
-  echo "<disks>" >> "$backup_xml"
-  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$checkpoint_xml"
-
-  local index=0
-  while IFS='|' read -r disk target; do
-    [[ -z "$disk" ]] && continue
-    local backup_file
-    backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
-    echo "<disk name='$disk' backup='yes' type='file'><target file='$dest/$backup_file' /><driver type='qcow2'/></disk>" >> "$backup_xml"
-    echo "<disk name='$disk' checkpoint='bitmap'/>" >> "$checkpoint_xml"
-    index=$((index + 1))
-  done < <(virsh -c qemu:///system domblklist "$vm_name" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
-
-  echo "</disks></domainbackup>" >> "$backup_xml"
-  echo "</disks></domaincheckpoint>" >> "$checkpoint_xml"
 }
 
 parse_rbd_uri() {

From dd39cc65c5323d162cc0a37fce20835bd7065ad0 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 14:20:56 +0900
Subject: [PATCH 44/93] =?UTF-8?q?=EC=89=98=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/cvtbackup.sh | 14 +++++++++++++-
 scripts/vm/hypervisor/kvm/nasbackup.sh | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index c76060ca5b62..376f1abb7437 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -eo pipefail
+set -Eeo pipefail
 
 OP=""
 VM=""
@@ -17,6 +17,18 @@ logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
 
+err_report() {
+  local exit_code="$1"
+  local line_no="$2"
+  local command="$3"
+  local function_name="${4:-main}"
+  local message="cvtbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
+  builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$message" >> "$logFile"
+  builtin echo "$message" >&2
+}
+
+trap 'err_report "$?" "$LINENO" "$BASH_COMMAND" "${FUNCNAME[1]:-main}"' ERR
+
 log() {
   [[ "$verb" -eq 1 ]] && builtin echo "$@"
   if [[ "$1" == "-ne" || "$1" == "-e" || "$1" == "-n" ]]; then
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index cb6a2c0aa80d..1e6378ec78ba 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -eo pipefail
+set -Eeo pipefail
 
 # CloudStack B&R NAS Backup and Recovery Tool for KVM
 
@@ -44,6 +44,18 @@ logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
 
+err_report() {
+  local exit_code="$1"
+  local line_no="$2"
+  local command="$3"
+  local function_name="${4:-main}"
+  local message="nasbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
+  builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$message" >> "$logFile"
+  builtin echo "$message" >&2
+}
+
+trap 'err_report "$?" "$LINENO" "$BASH_COMMAND" "${FUNCNAME[1]:-main}"' ERR
+
 log() {
   [[ "$verb" -eq 1 ]] && builtin echo "$@"
   if [[ "$1" == "-ne"  || "$1" == "-e" || "$1" == "-n" ]]; then

From dc9ef2bb58cd3e7a4e626d3717123d9b9fb19c4b Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 14:32:49 +0900
Subject: [PATCH 45/93] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/cvtbackup.sh | 2 +-
 scripts/vm/hypervisor/kvm/nasbackup.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 376f1abb7437..39cf8921a38e 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -23,7 +23,7 @@ err_report() {
   local command="$3"
   local function_name="${4:-main}"
   local message="cvtbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
-  builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$message" >> "$logFile"
+  log -ne "$message"
   builtin echo "$message" >&2
 }
 
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 1e6378ec78ba..2fa83c52c5a1 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -50,7 +50,7 @@ err_report() {
   local command="$3"
   local function_name="${4:-main}"
   local message="nasbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
-  builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$message" >> "$logFile"
+  log -ne "$message"
   builtin echo "$message" >&2
 }
 

From 8755d24f9c00c89d6e36ddb89b9ce109f6d312c1 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 14:36:30 +0900
Subject: [PATCH 46/93] =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/cvtbackup.sh | 1 +
 scripts/vm/hypervisor/kvm/nasbackup.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 39cf8921a38e..3cdf2c85c8f0 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -24,6 +24,7 @@ err_report() {
   local function_name="${4:-main}"
   local message="cvtbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
   log -ne "$message"
+  builtin echo "$message"
   builtin echo "$message" >&2
 }
 
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 2fa83c52c5a1..691667590278 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -51,6 +51,7 @@ err_report() {
   local function_name="${4:-main}"
   local message="nasbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
   log -ne "$message"
+  builtin echo "$message"
   builtin echo "$message" >&2
 }
 

From 3f5957d436be9492b5035884330008ce30d11e33 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 14:41:07 +0900
Subject: [PATCH 47/93] =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/cvtbackup.sh | 17 +++--------------
 scripts/vm/hypervisor/kvm/nasbackup.sh | 17 +++--------------
 2 files changed, 6 insertions(+), 28 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 3cdf2c85c8f0..19075d9b4bed 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-set -Eeo pipefail
+set -eo pipefail
 
 OP=""
 VM=""
@@ -17,19 +17,6 @@ logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
 
-err_report() {
-  local exit_code="$1"
-  local line_no="$2"
-  local command="$3"
-  local function_name="${4:-main}"
-  local message="cvtbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
-  log -ne "$message"
-  builtin echo "$message"
-  builtin echo "$message" >&2
-}
-
-trap 'err_report "$?" "$LINENO" "$BASH_COMMAND" "${FUNCNAME[1]:-main}"' ERR
-
 log() {
   [[ "$verb" -eq 1 ]] && builtin echo "$@"
   if [[ "$1" == "-ne" || "$1" == "-e" || "$1" == "-n" ]]; then
@@ -352,6 +339,8 @@ fi
 dest="$BACKUP_DIR"
 sanity_checks
 
+log -ne "cvtbackup.sh start op=[$OP] vm=[$VM] backupDir=[$BACKUP_DIR] backupType=[$BACKUP_TYPE] checkpoint=[$CHECKPOINT_NAME] parentBackup=[$PARENT_BACKUP_DIR] parentCheckpoint=[$PARENT_CHECKPOINT_NAME] diskPaths=[$DISK_PATHS] backupFiles=[$BACKUP_FILES]"
+
 if [[ "$OP" == "backup-running" ]]; then
   backup_running_vm
 elif [[ "$OP" == "backup-rbd" ]]; then
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 691667590278..d34f6ddac173 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -17,7 +17,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-set -Eeo pipefail
+set -eo pipefail
 
 # CloudStack B&R NAS Backup and Recovery Tool for KVM
 
@@ -44,19 +44,6 @@ logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
 
-err_report() {
-  local exit_code="$1"
-  local line_no="$2"
-  local command="$3"
-  local function_name="${4:-main}"
-  local message="nasbackup.sh failed at line ${line_no} in ${function_name}: [${command}] (exit=${exit_code})"
-  log -ne "$message"
-  builtin echo "$message"
-  builtin echo "$message" >&2
-}
-
-trap 'err_report "$?" "$LINENO" "$BASH_COMMAND" "${FUNCNAME[1]:-main}"' ERR
-
 log() {
   [[ "$verb" -eq 1 ]] && builtin echo "$@"
   if [[ "$1" == "-ne"  || "$1" == "-e" || "$1" == "-n" ]]; then
@@ -623,6 +610,8 @@ done
 # Perform Initial sanity checks
 sanity_checks
 
+log -ne "nasbackup.sh start op=[$OP] vm=[$VM] backupDir=[$BACKUP_DIR] backupType=[$BACKUP_TYPE] checkpoint=[$CHECKPOINT_NAME] parentBackup=[$PARENT_BACKUP_DIR] parentCheckpoint=[$PARENT_CHECKPOINT_NAME] diskPaths=[$DISK_PATHS] backupFiles=[$BACKUP_FILES]"
+
 if [ "$OP" = "backup-running" ]; then
   backup_running_vm
 elif [ "$OP" = "backup-rbd" ]; then

From ace4606eb18ed248b291f91706b465d746edbf93 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 14:50:24 +0900
Subject: [PATCH 48/93] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/LibvirtCommvaultBackupHelper.java    | 16 +++++++++++++++-
 .../resource/wrapper/LibvirtNasBackupHelper.java | 16 +++++++++++++++-
 2 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
index 2c4d81151ab5..c84f9fd17ecb 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
@@ -33,6 +33,8 @@
 import org.libvirt.Domain;
 import org.libvirt.DomainInfo.DomainState;
 import org.libvirt.LibvirtException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -44,6 +46,7 @@
 import java.util.stream.Collectors;
 
 class LibvirtCommvaultBackupHelper {
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibvirtCommvaultBackupHelper.class);
     static final Integer EXIT_CLEANUP_FAILED = 20;
     private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
 
@@ -72,12 +75,16 @@ String getScriptOperation() {
     Pair<Integer, String> executeBackup(CommvaultTakeBackupCommand command) {
         List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
         BackupExecutionMode executionMode = determineExecutionMode(command.getVmName(), command.getVolumePools());
+        LOGGER.debug("Commvault backup execution mode=[{}], vm=[{}], backupType=[{}], diskPaths=[{}]",
+                executionMode, command.getVmName(), command.getBackupType(), diskPaths);
         if (BackupExecutionMode.STOPPED.equals(executionMode)) {
             return executeStoppedVmBackup(command, diskPaths);
         }
 
         List<String[]> commands = new ArrayList<>();
-        commands.add(buildBackupScriptCommand(command, diskPaths, executionMode));
+        String[] scriptCommand = buildBackupScriptCommand(command, diskPaths, executionMode);
+        LOGGER.debug("Executing Commvault backup script command=[{}]", String.join(" ", scriptCommand));
+        commands.add(scriptCommand);
         return Script.executePipedCommands(commands, resource.getCmdsTimeout());
     }
 
@@ -141,6 +148,8 @@ private Pair<Integer, String> executeStoppedVmBackup(CommvaultTakeBackupCommand
         Path dest = Path.of(command.getBackupPath());
         Connect conn = null;
         try {
+            LOGGER.info("Starting stopped VM Commvault backup for vm=[{}], dummyVm=[{}], backupType=[{}]",
+                    command.getVmName(), dummyVmName, command.getBackupType());
             validateStoppedBackupDiskPaths(diskPaths);
             if (isIncremental(command)) {
                 resource.validateLibvirtAndQemuVersionForIncrementalSnapshots();
@@ -161,7 +170,9 @@ private Pair<Integer, String> executeStoppedVmBackup(CommvaultTakeBackupCommand
 
             String backupBeginCommand = String.format("virsh -c qemu:///system backup-begin --domain %s --backupxml %s --checkpointxml %s",
                     shellQuote(dummyVmName), shellQuote(backupXml.toString()), shellQuote(checkpointXml.toString()));
+            LOGGER.debug("Starting stopped VM Commvault backup-begin command=[{}]", backupBeginCommand);
             if (Script.runSimpleBashScriptForExitValue(backupBeginCommand, resource.getCmdsTimeout(), false) != 0) {
+                LOGGER.error("Failed to start backup for stopped VM Commvault dummy domain [{}]", dummyVmName);
                 return new Pair<>(1, "Failed to start backup for dummy VM " + dummyVmName);
             }
 
@@ -180,8 +191,11 @@ private Pair<Integer, String> executeStoppedVmBackup(CommvaultTakeBackupCommand
             Files.deleteIfExists(backupXml);
             Files.deleteIfExists(checkpointXml);
             Script.runSimpleBashScriptForExitValue("sync", resource.getCmdsTimeout(), false);
+            LOGGER.info("Completed stopped VM Commvault backup for vm=[{}], dummyVm=[{}]", command.getVmName(), dummyVmName);
             return new Pair<>(0, "success");
         } catch (Exception e) {
+            LOGGER.error("Stopped VM Commvault backup failed for vm=[{}], dummyVm=[{}] due to: {}",
+                    command.getVmName(), dummyVmName, e.getMessage(), e);
             return new Pair<>(1, e.getMessage());
         } finally {
             cleanupDummyVm(dummyVmName);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
index 85709fff967a..662815d341c5 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
@@ -34,6 +34,8 @@
 import org.libvirt.Domain;
 import org.libvirt.DomainInfo.DomainState;
 import org.libvirt.LibvirtException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -47,6 +49,7 @@
 import java.util.stream.Collectors;
 
 class LibvirtNasBackupHelper {
+    private static final Logger LOGGER = LoggerFactory.getLogger(LibvirtNasBackupHelper.class);
     static final Integer EXIT_CLEANUP_FAILED = 20;
     private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
 
@@ -75,11 +78,15 @@ String getScriptOperation() {
     Pair<Integer, String> executeBackup(TakeBackupCommand command) {
         List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
         BackupExecutionMode executionMode = determineExecutionMode(command.getVmName(), command.getVolumePools());
+        LOGGER.debug("NAS backup execution mode=[{}], vm=[{}], backupType=[{}], diskPaths=[{}]",
+                executionMode, command.getVmName(), command.getBackupType(), diskPaths);
         if (BackupExecutionMode.STOPPED.equals(executionMode)) {
             return executeStoppedVmBackup(command, diskPaths);
         }
         List<String[]> commands = new ArrayList<>();
-        commands.add(buildBackupScriptCommand(command, diskPaths, executionMode));
+        String[] scriptCommand = buildBackupScriptCommand(command, diskPaths, executionMode);
+        LOGGER.debug("Executing NAS backup script command=[{}]", String.join(" ", scriptCommand));
+        commands.add(scriptCommand);
         return Script.executePipedCommands(commands, resource.getCmdsTimeout());
     }
 
@@ -171,6 +178,8 @@ private Pair<Integer, String> executeStoppedVmBackup(TakeBackupCommand command,
         String dummyVmName = String.format("DUMMY-VM-%s", command.getCheckpointName().replace('.', '-'));
         Connect conn = null;
         try {
+            LOGGER.info("Starting stopped VM NAS backup for vm=[{}], dummyVm=[{}], backupType=[{}]",
+                    command.getVmName(), dummyVmName, command.getBackupType());
             validateStoppedBackupDiskPaths(diskPaths);
             if (isIncremental(command)) {
                 resource.validateLibvirtAndQemuVersionForIncrementalSnapshots();
@@ -193,7 +202,9 @@ private Pair<Integer, String> executeStoppedVmBackup(TakeBackupCommand command,
 
             String backupBeginCommand = String.format("virsh -c qemu:///system backup-begin --domain %s --backupxml %s --checkpointxml %s",
                     shellQuote(dummyVmName), shellQuote(backupXml.toString()), shellQuote(checkpointXml.toString()));
+            LOGGER.debug("Starting stopped VM NAS backup-begin command=[{}]", backupBeginCommand);
             if (Script.runSimpleBashScriptForExitValue(backupBeginCommand, resource.getCmdsTimeout(), false) != 0) {
+                LOGGER.error("Failed to start backup for stopped VM dummy domain [{}]", dummyVmName);
                 return new Pair<>(1, "Failed to start backup for dummy VM " + dummyVmName);
             }
 
@@ -215,8 +226,11 @@ private Pair<Integer, String> executeStoppedVmBackup(TakeBackupCommand command,
             Files.deleteIfExists(checkpointXml);
             runCommand(String.format("sync"));
             String output = listTopLevelFileSizes(dest);
+            LOGGER.info("Completed stopped VM NAS backup for vm=[{}], dummyVm=[{}]", command.getVmName(), dummyVmName);
             return new Pair<>(0, output);
         } catch (Exception e) {
+            LOGGER.error("Stopped VM NAS backup failed for vm=[{}], dummyVm=[{}] due to: {}",
+                    command.getVmName(), dummyVmName, e.getMessage(), e);
             return new Pair<>(1, e.getMessage());
         } finally {
             cleanupDummyVm(dummyVmName);

From 63a18a8915ab7f5146b7f3f0eedae330151c06da Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 14:53:35 +0900
Subject: [PATCH 49/93] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index d34f6ddac173..be9979069a32 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -73,9 +73,14 @@ vercomp() {
 }
 
 sanity_checks() {
+  log -ne "sanity_checks entered"
+  log -ne "before hvVersion"
   hvVersion=$(virsh version | grep hypervisor | awk '{print $(NF)}')
+  log -ne "before libvVersion"
   libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1)
+  log -ne "before apiVersion"
   apiVersion=$(virsh version | grep API | awk '{print $(NF)}')
+  log -ne "versions resolved hv=[$hvVersion] libvirt=[$libvVersion] api=[$apiVersion]"
 
   # Compare qemu version (hvVersion >= 4.2.0)
   vercomp "$hvVersion" ">=" "4.2.0"

From b5aa28afdaa65f28538dc2e6e2e0c9df78192b63 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 16:19:19 +0900
Subject: [PATCH 50/93] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/wrapper/LibvirtTakeBackupCommandWrapper.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
index 8ba999ee1f6a..b954f8804edc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
@@ -33,9 +33,15 @@
 public class LibvirtTakeBackupCommandWrapper extends CommandWrapper<TakeBackupCommand, Answer, LibvirtComputingResource> {
     @Override
     public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
+        logger.info("LibvirtTakeBackupCommandWrapper entering execute for vm=[{}], backupPath=[{}], backupType=[{}]",
+                command.getVmName(), command.getBackupPath(), command.getBackupType());
         LibvirtNasBackupHelper backupHelper = new LibvirtNasBackupHelper(libvirtComputingResource);
         List<String> diskPaths = backupHelper.resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
+        logger.info("LibvirtTakeBackupCommandWrapper invoking helper for vm=[{}], diskPaths=[{}]",
+                command.getVmName(), diskPaths);
         Pair<Integer, String> result = backupHelper.executeBackup(command);
+        logger.info("LibvirtTakeBackupCommandWrapper helper returned for vm=[{}], resultCode=[{}], details=[{}]",
+                command.getVmName(), result.first(), result.second());
 
         if (result.first() != 0) {
             logger.debug("Failed to take VM backup: " + result.second());

From fb3474040ec64db7639894f34b9261550f964845 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 16:19:48 +0900
Subject: [PATCH 51/93] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
index 662815d341c5..9065e9471638 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
@@ -76,6 +76,8 @@ String getScriptOperation() {
     }
 
     Pair<Integer, String> executeBackup(TakeBackupCommand command) {
+        LOGGER.info("LibvirtNasBackupHelper executeBackup entered for vm=[{}], backupPath=[{}], backupType=[{}]",
+                command.getVmName(), command.getBackupPath(), command.getBackupType());
         List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
         BackupExecutionMode executionMode = determineExecutionMode(command.getVmName(), command.getVolumePools());
         LOGGER.debug("NAS backup execution mode=[{}], vm=[{}], backupType=[{}], diskPaths=[{}]",

From 768d6e38f7923c7c08f50bde3bde7df6f1b544ed Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 16:45:33 +0900
Subject: [PATCH 52/93] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java  | 6 +++---
 .../kvm/resource/wrapper/LibvirtNasBackupHelper.java        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
index c84f9fd17ecb..9d175634b7c5 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
@@ -33,8 +33,8 @@
 import org.libvirt.Domain;
 import org.libvirt.DomainInfo.DomainState;
 import org.libvirt.LibvirtException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -46,7 +46,7 @@
 import java.util.stream.Collectors;
 
 class LibvirtCommvaultBackupHelper {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibvirtCommvaultBackupHelper.class);
+    protected Logger LOGGER = LogManager.getLogger(LibvirtCommvaultBackupHelper.class);
     static final Integer EXIT_CLEANUP_FAILED = 20;
     private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
index 9065e9471638..74ef0c8e7b04 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
@@ -34,8 +34,8 @@
 import org.libvirt.Domain;
 import org.libvirt.DomainInfo.DomainState;
 import org.libvirt.LibvirtException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -49,7 +49,7 @@
 import java.util.stream.Collectors;
 
 class LibvirtNasBackupHelper {
-    private static final Logger LOGGER = LoggerFactory.getLogger(LibvirtNasBackupHelper.class);
+    protected Logger LOGGER = LogManager.getLogger(LibvirtNasBackupHelper.class);
     static final Integer EXIT_CLEANUP_FAILED = 20;
     private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
 

From 320e9c4d4a23a9665a53507c025154b9ddbe59a7 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 17:11:25 +0900
Subject: [PATCH 53/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 33 +++++++++++++++++++-------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index be9979069a32..b8ff6e1e5a88 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -73,14 +73,31 @@ vercomp() {
 }
 
 sanity_checks() {
-  log -ne "sanity_checks entered"
-  log -ne "before hvVersion"
-  hvVersion=$(virsh version | grep hypervisor | awk '{print $(NF)}')
-  log -ne "before libvVersion"
-  libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1)
-  log -ne "before apiVersion"
-  apiVersion=$(virsh version | grep API | awk '{print $(NF)}')
-  log -ne "versions resolved hv=[$hvVersion] libvirt=[$libvVersion] api=[$apiVersion]"
+  log -ne "sanity_checks entered"; builtin echo "sanity_checks entered"
+  log -ne "before virsh version"; builtin echo "before virsh version"
+  local virsh_version_output
+  virsh_version_output=$(virsh version 2>&1) || {
+    echo "Failed to execute 'virsh version': $virsh_version_output"
+    exit 1
+  }
+  log -ne "virsh version output=[$virsh_version_output]"; builtin echo "virsh version output=[$virsh_version_output]"
+
+  log -ne "before hvVersion parse"; builtin echo "before hvVersion parse"
+  hvVersion=$(printf '%s\n' "$virsh_version_output" | grep hypervisor | awk '{print $(NF)}') || {
+    echo "Failed to parse hypervisor version from virsh output"
+    exit 1
+  }
+  log -ne "before libvVersion parse"; builtin echo "before libvVersion parse"
+  libvVersion=$(printf '%s\n' "$virsh_version_output" | grep libvirt | awk '{print $(NF)}' | tail -n 1) || {
+    echo "Failed to parse libvirt version from virsh output"
+    exit 1
+  }
+  log -ne "before apiVersion parse"; builtin echo "before apiVersion parse"
+  apiVersion=$(printf '%s\n' "$virsh_version_output" | grep API | awk '{print $(NF)}') || {
+    echo "Failed to parse API version from virsh output"
+    exit 1
+  }
+  log -ne "versions resolved hv=[$hvVersion] libvirt=[$libvVersion] api=[$apiVersion]"; builtin echo "versions resolved hv=[$hvVersion] libvirt=[$libvVersion] api=[$apiVersion]"
 
   # Compare qemu version (hvVersion >= 4.2.0)
   vercomp "$hvVersion" ">=" "4.2.0"

From a4b3726bf340bc611801305ee5f72e9efc9e5af9 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 17:13:44 +0900
Subject: [PATCH 54/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index b8ff6e1e5a88..0f6fa304b897 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -460,8 +460,6 @@ redefine_checkpoint_if_needed() {
   fi
 }
 
-}
-
 parse_rbd_uri() {
   local uri="$1"
   log -ne "parse_rbd_uri called with uri=[$uri]"

From f44828d68265bc500c161febdd3e39750deca81d Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Mon, 6 Apr 2026 17:18:15 +0900
Subject: [PATCH 55/93] Update nasbackup.sh

---
 scripts/vm/hypervisor/kvm/nasbackup.sh | 33 +++-----------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 0f6fa304b897..d3037b034659 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -73,37 +73,12 @@ vercomp() {
 }
 
 sanity_checks() {
-  log -ne "sanity_checks entered"; builtin echo "sanity_checks entered"
-  log -ne "before virsh version"; builtin echo "before virsh version"
-  local virsh_version_output
-  virsh_version_output=$(virsh version 2>&1) || {
-    echo "Failed to execute 'virsh version': $virsh_version_output"
-    exit 1
-  }
-  log -ne "virsh version output=[$virsh_version_output]"; builtin echo "virsh version output=[$virsh_version_output]"
+  hvVersion=$(virsh version | grep hypervisor | awk '{print $(NF)}')
+  libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1)
+  apiVersion=$(virsh version | grep API | awk '{print $(NF)}')
 
-  log -ne "before hvVersion parse"; builtin echo "before hvVersion parse"
-  hvVersion=$(printf '%s\n' "$virsh_version_output" | grep hypervisor | awk '{print $(NF)}') || {
-    echo "Failed to parse hypervisor version from virsh output"
-    exit 1
-  }
-  log -ne "before libvVersion parse"; builtin echo "before libvVersion parse"
-  libvVersion=$(printf '%s\n' "$virsh_version_output" | grep libvirt | awk '{print $(NF)}' | tail -n 1) || {
-    echo "Failed to parse libvirt version from virsh output"
-    exit 1
-  }
-  log -ne "before apiVersion parse"; builtin echo "before apiVersion parse"
-  apiVersion=$(printf '%s\n' "$virsh_version_output" | grep API | awk '{print $(NF)}') || {
-    echo "Failed to parse API version from virsh output"
-    exit 1
-  }
-  log -ne "versions resolved hv=[$hvVersion] libvirt=[$libvVersion] api=[$apiVersion]"; builtin echo "versions resolved hv=[$hvVersion] libvirt=[$libvVersion] api=[$apiVersion]"
-
-  # Compare qemu version (hvVersion >= 4.2.0)
   vercomp "$hvVersion" ">=" "4.2.0"
   hvStatus=$?
-
-  # Compare libvirt version (libvVersion >= 7.2.0)
   vercomp "$libvVersion" ">=" "7.2.0"
   libvStatus=$?
 
@@ -113,8 +88,6 @@ sanity_checks() {
     echo "Failure... Your QEMU version $hvVersion or libvirt version $libvVersion is unsupported. Consider upgrading to the required minimum version of QEMU: 4.2.0 and Libvirt: 7.2.0"
     exit 1
   fi
-
-  log -ne "Environment Sanity Checks successfully passed"
 }
 
 ### Operation methods ###

From dc0e66acfcf0a5f9203be15a0c2b804f5c587009 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Tue, 7 Apr 2026 15:44:10 +0900
Subject: [PATCH 56/93] =?UTF-8?q?rbd=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20meta?=
 =?UTF-8?q?=ED=98=95=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EC=A0=80=EC=9E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/apache/cloudstack/backup/NASBackupProvider.java  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 7f37fd4bf8f8..9c6ccc0a0db9 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -339,7 +339,7 @@ private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String
             details.putAll(backupDetails);
         }
         details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
-        details.put(DETAIL_CHECKPOINT_PATH, String.format("%s/checkpoints/%s.xml", backupPath, checkpointName));
+        details.put(DETAIL_CHECKPOINT_PATH, getCheckpointPath(backupPath, checkpointName, backupEngine));
         details.put(DETAIL_BACKUP_ENGINE, backupEngine);
         if (parentBackup != null) {
             details.put(DETAIL_PARENT_BACKUP_UUID, parentBackup.getUuid());
@@ -352,6 +352,13 @@ private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String
         return backupDao.persist(backup);
     }
 
+    private String getCheckpointPath(String backupPath, String checkpointName, String backupEngine) {
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            return String.format("%s/checkpoints/%s.meta", backupPath, checkpointName);
+        }
+        return String.format("%s/checkpoints/%s.xml", backupPath, checkpointName);
+    }
+
     private BackupVO getLatestBackedUpBackup(VirtualMachine vm) {
         List<Backup> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId());
         return backups.stream()

From f2e71a0e7b79ae6ac94531d393b085b5485bad23 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 09:11:14 +0900
Subject: [PATCH 57/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=EB=B3=B8=EC=9D=84=20?=
 =?UTF-8?q?=EB=B3=B5=EC=9B=90=ED=95=98=EC=97=AC=20=EC=8A=A4=EB=83=85?=
 =?UTF-8?q?=EC=83=B7=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EA=B0=95=EC=A0=9C=20FULL=20=EB=B0=B1=EC=97=85=20=EC=8B=A4?=
 =?UTF-8?q?=ED=96=89=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/CommvaultBackupProvider.java       | 52 +++++++++++++++----
 .../cloudstack/backup/NASBackupProvider.java  | 50 ++++++++++++++----
 scripts/vm/hypervisor/kvm/cvtbackup.sh        | 19 ++++---
 scripts/vm/hypervisor/kvm/nasbackup.sh        |  7 +++
 4 files changed, 103 insertions(+), 25 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 4952113a2364..7315265fb415 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -110,6 +110,7 @@ public class CommvaultBackupProvider extends AdapterBase implements BackupProvid
     private static final String DETAIL_PARENT_CHECKPOINT_NAME = "commvault.parent.checkpoint.name";
     private static final String DETAIL_PARENT_CHECKPOINT_PATH = "commvault.parent.checkpoint.path";
     private static final String DETAIL_BACKUP_ENGINE = "commvault.backup.engine";
+    private static final String MISSING_PARENT_RBD_SNAPSHOT_ERROR = "Parent RBD snapshot";
     private static final String DETAIL_STAGE_HOST = "commvault.stage.host";
     private static final String RM_COMMAND = "rm -rf %s";
     private static final int BASE_MAJOR = 11;
@@ -307,15 +308,15 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         validateVolumePoolTypes(volumePoolsAndPaths.first());
         final Backup latestBackup = getLatestBackedUpBackup(vm);
         final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup, vmHost);
-        Pair<Boolean, Backup> result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, backupPath, vmVolumes, volumePoolsAndPaths,
+        BackupExecutionResult result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, backupPath, vmVolumes, volumePoolsAndPaths,
                 latestBackup, incrementalBackup, incrementalBackup && vmVolumes.size() > 1);
-        if (!result.first() && incrementalBackup && vmVolumes.size() > 1) {
-            LOG.warn("Incremental backup failed for multi-disk VM [{}]. Retrying as full backup to preserve disk consistency.", vm);
+        if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
+            LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
             String fallbackBackupPath = buildBackupPath(vm);
-            return executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, fallbackBackupPath, vmVolumes, volumePoolsAndPaths,
+            result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, fallbackBackupPath, vmVolumes, volumePoolsAndPaths,
                     null, false, false);
         }
-        return result;
+        return new Pair<>(result.success, result.backup);
     }
 
     private Backup getLatestBackedUpBackup(VirtualMachine vm) {
@@ -428,7 +429,7 @@ private void validateNoVmSnapshots(VirtualMachine vm) {
         }
     }
 
-    private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM, Host vmHost, HostVO vmHostVO, CommvaultClient client,
+    private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host vmHost, HostVO vmHostVO, CommvaultClient client,
                                                 String planId, String backupPath, List<VolumeVO> vmVolumes,
                                                 Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths, Backup latestBackup,
                                                 boolean incrementalBackup, boolean retryAsFullOnFailure) {
@@ -530,7 +531,7 @@ private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM
                                     backupVO.setDetails(backupDetails);
                                     backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
                                     if (backupDao.update(backupVO.getId(), backupVO)) {
-                                        return new Pair<>(true, backupVO);
+                                        return BackupExecutionResult.success(backupVO);
                                     }
                                     throw new CloudRuntimeException("Failed to update backup");
                                 }
@@ -551,10 +552,11 @@ private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
             executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, cmd);
-            return new Pair<>(false, null);
+            return BackupExecutionResult.failure("Failed to complete Commvault backup job");
         }
 
-        LOG.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
+        final String details = answer != null ? answer.getDetails() : "No answer received";
+        LOG.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), details);
         if (retryAsFullOnFailure) {
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
@@ -566,7 +568,37 @@ private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
         }
-        return new Pair<>(false, null);
+        return BackupExecutionResult.failure(details);
+    }
+
+    private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult result, List<VolumeVO> vmVolumes) {
+        if (result == null || result.success) {
+            return false;
+        }
+        if (StringUtils.contains(result.details, MISSING_PARENT_RBD_SNAPSHOT_ERROR)) {
+            return true;
+        }
+        return vmVolumes.size() > 1;
+    }
+
+    private static final class BackupExecutionResult {
+        private final boolean success;
+        private final Backup backup;
+        private final String details;
+
+        private BackupExecutionResult(boolean success, Backup backup, String details) {
+            this.success = success;
+            this.backup = backup;
+            this.details = details;
+        }
+
+        private static BackupExecutionResult success(Backup backup) {
+            return new BackupExecutionResult(true, backup, null);
+        }
+
+        private static BackupExecutionResult failure(String details) {
+            return new BackupExecutionResult(false, null, details);
+        }
     }
 
     private String buildBackupPath(VirtualMachine vm) {
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 9c6ccc0a0db9..25d215be49aa 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -94,6 +94,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
     private static final String DETAIL_PARENT_CHECKPOINT_NAME = "nas.parent.checkpoint.name";
     private static final String DETAIL_PARENT_CHECKPOINT_PATH = "nas.parent.checkpoint.path";
     private static final String DETAIL_BACKUP_ENGINE = "nas.backup.engine";
+    private static final String MISSING_PARENT_RBD_SNAPSHOT_ERROR = "Parent RBD snapshot";
 
     ConfigKey<Integer> NASBackupRestoreMountTimeout = new ConfigKey<>("Advanced", Integer.class,
             "nas.backup.restore.mount.timeout",
@@ -226,16 +227,16 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
         validateVolumePoolTypes(volumePoolsAndPaths.first());
         final BackupVO latestBackup = getLatestBackedUpBackup(vm);
         final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup);
-        Pair<Boolean, Backup> result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, latestBackup, incrementalBackup,
+        BackupExecutionResult result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, latestBackup, incrementalBackup,
                 incrementalBackup && vmVolumes.size() > 1);
-        if (!result.first() && incrementalBackup && vmVolumes.size() > 1) {
-            LOG.warn("Incremental backup failed for multi-disk VM [{}]. Retrying as full backup to preserve disk consistency.", vm);
-            return executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, null, false, false);
+        if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
+            LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
+            result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, null, false, false);
         }
-        return result;
+        return new Pair<>(result.success, result.backup);
     }
 
-    private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM, Host host, BackupRepository backupRepository,
+    private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host host, BackupRepository backupRepository,
                                                 List<VolumeVO> vmVolumes, Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths,
                                                 Backup parentBackup, boolean incrementalBackup, boolean retryAsFullOnFailure) {
         final String backupPath = buildBackupPath(vm);
@@ -282,12 +283,13 @@ private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.BackedUp);
             backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
             if (backupDao.update(backupVO.getId(), backupVO)) {
-                return new Pair<>(true, backupVO);
+                return BackupExecutionResult.success(backupVO);
             }
             throw new CloudRuntimeException("Failed to update backup");
         }
 
-        logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
+        final String details = answer != null ? answer.getDetails() : "No answer received";
+        logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), details);
         if (retryAsFullOnFailure) {
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
@@ -299,7 +301,37 @@ private Pair<Boolean, Backup> executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
         }
-        return new Pair<>(false, null);
+        return BackupExecutionResult.failure(details);
+    }
+
+    private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult result, List<VolumeVO> vmVolumes) {
+        if (result == null || result.success) {
+            return false;
+        }
+        if (StringUtils.contains(result.details, MISSING_PARENT_RBD_SNAPSHOT_ERROR)) {
+            return true;
+        }
+        return vmVolumes.size() > 1;
+    }
+
+    private static final class BackupExecutionResult {
+        private final boolean success;
+        private final Backup backup;
+        private final String details;
+
+        private BackupExecutionResult(boolean success, Backup backup, String details) {
+            this.success = success;
+            this.backup = backup;
+            this.details = details;
+        }
+
+        private static BackupExecutionResult success(Backup backup) {
+            return new BackupExecutionResult(true, backup, null);
+        }
+
+        private static BackupExecutionResult failure(String details) {
+            return new BackupExecutionResult(false, null, details);
+        }
     }
 
     private String buildBackupPath(VirtualMachine vm) {
diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 19075d9b4bed..9b9fd8597470 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -274,15 +274,22 @@ backup_rbd_volumes() {
     local output_file="$dest/$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")"
     log -ne "Starting RBD backup for disk path [$disk_path], resolved image [$RBD_IMAGE], output [$output_file]"
 
-    if ! timeout 30s "${RBD_CMD[@]}" info "$RBD_IMAGE" >> "$logFile" 2>&1; then
-      echo "Failed to access RBD image $RBD_IMAGE"
-      cleanup
-    fi
+  if ! timeout 30s "${RBD_CMD[@]}" info "$RBD_IMAGE" >> "$logFile" 2>&1; then
+    echo "Failed to access RBD image $RBD_IMAGE"
+    cleanup
+  fi
 
-    if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${CHECKPOINT_NAME}" >> "$logFile" 2>&1; then
-      echo "Failed to create RBD snapshot ${RBD_IMAGE}@${CHECKPOINT_NAME}"
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+    if ! timeout 30s "${RBD_CMD[@]}" snap ls "$RBD_IMAGE" 2>>"$logFile" | awk 'NR>1 {print $2}' | grep -Fxq "$PARENT_CHECKPOINT_NAME"; then
+      echo "Parent RBD snapshot ${RBD_IMAGE}@${PARENT_CHECKPOINT_NAME} not found for incremental backup"
       cleanup
     fi
+  fi
+
+  if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${CHECKPOINT_NAME}" >> "$logFile" 2>&1; then
+    echo "Failed to create RBD snapshot ${RBD_IMAGE}@${CHECKPOINT_NAME}"
+    cleanup
+  fi
     created_snapshot="${RBD_IMAGE}@${CHECKPOINT_NAME}"
 
     if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index d3037b034659..5b655ac1055d 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -227,6 +227,13 @@ backup_rbd_volumes() {
       cleanup
     fi
 
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      if ! timeout 30s "${RBD_CMD[@]}" snap ls "$RBD_IMAGE" 2>>"$logFile" | awk 'NR>1 {print $2}' | grep -Fxq "$PARENT_CHECKPOINT_NAME"; then
+        echo "Parent RBD snapshot ${RBD_IMAGE}@${PARENT_CHECKPOINT_NAME} not found for incremental backup"
+        cleanup
+      fi
+    fi
+
     if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
       echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
       cleanup

From 5f5b17412168fb29a905f6d517bc22e80ed21ba6 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 09:21:41 +0900
Subject: [PATCH 58/93] Update CommvaultBackupProvider.java

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 7315265fb415..b9924b264b16 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -67,6 +67,7 @@
 import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 import org.apache.xml.utils.URI;

From baa3bd021c8a768c0bf75eee6e12f4c913c7bb3f Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 11:43:28 +0900
Subject: [PATCH 59/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=EC=8B=9C=20details=20=EB=8F=84=20=EC=82=AD=EC=A0=9C=EB=90=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/apache/cloudstack/backup/BackupManagerImpl.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 15707bb196a0..a53cf8ca721a 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1656,6 +1656,7 @@ public boolean deleteBackup(final Long backupId, final Boolean forced) {
             Long backupSize = backup.getSize() != null ? backup.getSize() : 0L;
             resourceLimitMgr.decrementResourceCount(backup.getAccountId(), Resource.ResourceType.backup_storage, backupSize);
             if (backupDao.remove(backup.getId())) {
+                backupDetailsDao.removeDetails(backup.getId());
                 checkAndGenerateUsageForLastBackupDeletedAfterOfferingRemove(vm, backup);
                 return true;
             } else {

From 5d19daf9b41c34698a5884f7f43e54eb25dfb30e Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 13:12:46 +0900
Subject: [PATCH 60/93] =?UTF-8?q?Incremental=20=EB=B0=B1=EC=97=85=20?=
 =?UTF-8?q?=EC=8B=9C=EB=8F=84=EC=8B=9C=20parent=20=EC=97=86=EB=8A=94=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20FULL=20=EB=B0=B1=EC=97=85=20=EA=B0=95?=
 =?UTF-8?q?=EC=A0=9C=ED=95=A0=EB=95=8C=20=EC=8B=A4=ED=8C=A8=ED=95=9C=20?=
 =?UTF-8?q?=EB=B0=B1=EC=97=85=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudstack/backup/CommvaultBackupProvider.java | 14 +++++++++++---
 .../cloudstack/backup/NASBackupProvider.java       | 14 +++++++++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index b9924b264b16..05b587eb616e 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -312,6 +312,7 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         BackupExecutionResult result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, backupPath, vmVolumes, volumePoolsAndPaths,
                 latestBackup, incrementalBackup, incrementalBackup && vmVolumes.size() > 1);
         if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
+            cleanupFailedBackupForFullRetry(result.backup);
             LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
             String fallbackBackupPath = buildBackupPath(vm);
             result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, fallbackBackupPath, vmVolumes, volumePoolsAndPaths,
@@ -569,7 +570,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
         }
-        return BackupExecutionResult.failure(details);
+        return BackupExecutionResult.failure(details, backupVO);
     }
 
     private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult result, List<VolumeVO> vmVolumes) {
@@ -582,6 +583,13 @@ private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult r
         return vmVolumes.size() > 1;
     }
 
+    private void cleanupFailedBackupForFullRetry(Backup backup) {
+        if (backup == null) {
+            return;
+        }
+        backupDao.remove(backup.getId());
+    }
+
     private static final class BackupExecutionResult {
         private final boolean success;
         private final Backup backup;
@@ -597,8 +605,8 @@ private static BackupExecutionResult success(Backup backup) {
             return new BackupExecutionResult(true, backup, null);
         }
 
-        private static BackupExecutionResult failure(String details) {
-            return new BackupExecutionResult(false, null, details);
+        private static BackupExecutionResult failure(String details, Backup backup) {
+            return new BackupExecutionResult(false, backup, details);
         }
     }
 
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 25d215be49aa..bbe9d1ea644c 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -230,6 +230,7 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
         BackupExecutionResult result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, latestBackup, incrementalBackup,
                 incrementalBackup && vmVolumes.size() > 1);
         if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
+            cleanupFailedBackupForFullRetry(result.backup);
             LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
             result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, null, false, false);
         }
@@ -301,7 +302,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
         }
-        return BackupExecutionResult.failure(details);
+        return BackupExecutionResult.failure(details, backupVO);
     }
 
     private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult result, List<VolumeVO> vmVolumes) {
@@ -314,6 +315,13 @@ private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult r
         return vmVolumes.size() > 1;
     }
 
+    private void cleanupFailedBackupForFullRetry(Backup backup) {
+        if (backup == null) {
+            return;
+        }
+        backupDao.remove(backup.getId());
+    }
+
     private static final class BackupExecutionResult {
         private final boolean success;
         private final Backup backup;
@@ -329,8 +337,8 @@ private static BackupExecutionResult success(Backup backup) {
             return new BackupExecutionResult(true, backup, null);
         }
 
-        private static BackupExecutionResult failure(String details) {
-            return new BackupExecutionResult(false, null, details);
+        private static BackupExecutionResult failure(String details, Backup backup) {
+            return new BackupExecutionResult(false, backup, details);
         }
     }
 

From fc4c24f8d0649bcf8b563e1bf7f69ef037a27afa Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 13:36:59 +0900
Subject: [PATCH 61/93] Update CommvaultBackupProvider.java

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 05b587eb616e..5a4d490de806 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -554,7 +554,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setStatus(Backup.Status.Failed);
             backupDao.remove(backupVO.getId());
             executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, cmd);
-            return BackupExecutionResult.failure("Failed to complete Commvault backup job");
+            return BackupExecutionResult.failure("Failed to complete Commvault backup job", backupVO);
         }
 
         final String details = answer != null ? answer.getDetails() : "No answer received";

From a2f878df673cbde81f9946ee11bcd83cc6eb5641 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 14:27:05 +0900
Subject: [PATCH 62/93] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=B2=B4=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B3=B5=EC=9B=90=EC=8B=9C=20diff=20=EB=AA=BB=EC=9D=BD?=
 =?UTF-8?q?=EC=96=B4=EC=98=A4=EB=8A=94=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/CommvaultBackupProvider.java         |  8 ++++++++
 .../cloudstack/backup/NASBackupProvider.java    |  8 ++++++++
 ...irtCommvaultRestoreBackupCommandWrapper.java | 15 ---------------
 .../LibvirtRestoreBackupCommandWrapper.java     | 17 -----------------
 4 files changed, 16 insertions(+), 32 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 5a4d490de806..d1ebd52c63d1 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -661,11 +661,13 @@ private List<String> getBackupFileChains(List<Backup.VolumeInfo> backupVolumes,
     }
 
     private String getBackupFileChain(Backup.VolumeInfo backupVolume, Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
         List<String> chain = getBackupChain(backupVolume, backup);
         return String.join(";", chain);
     }
 
     private List<String> getBackupChain(Backup.VolumeInfo backupVolume, Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
         List<String> chain = new ArrayList<>();
         Backup current = backup;
         while (current != null) {
@@ -689,6 +691,12 @@ private List<String> getBackupChain(Backup.VolumeInfo backupVolume, Backup backu
         return chain;
     }
 
+    private void loadBackupDetailsIfNeeded(Backup backup) {
+        if (backup instanceof BackupVO && backup.getDetails() == null) {
+            backupDao.loadDetails((BackupVO) backup);
+        }
+    }
+
     private boolean isLegacyBackup(Backup backup) {
         return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
     }
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index bbe9d1ea644c..7bfeabf46106 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -585,6 +585,7 @@ private List<String> getBackupFileChains(List<Backup.VolumeInfo> backedVolumes,
     }
 
     private List<String> getBackupFileChain(String volumeUuid, Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
         if (isLegacyBackup(backup)) {
             Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
             return volumeInfo != null ? getLegacyBackupFileCandidates(volumeInfo) : List.of();
@@ -608,6 +609,7 @@ private List<String> getBackupFileChain(String volumeUuid, Backup backup) {
     }
 
     private List<Backup> getBackupChain(Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
         List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
         Map<String, Backup> backupsByUuid = new HashMap<>();
         for (Backup candidate : backups) {
@@ -628,6 +630,12 @@ private List<Backup> getBackupChain(Backup backup) {
         return chain;
     }
 
+    private void loadBackupDetailsIfNeeded(Backup backup) {
+        if (backup instanceof BackupVO && backup.getDetails() == null) {
+            backupDao.loadDetails((BackupVO) backup);
+        }
+    }
+
     private boolean isLegacyBackup(Backup backup) {
         return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
     }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index d3c6fe5efec3..7906a10261bc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -57,7 +57,6 @@ public class LibvirtCommvaultRestoreBackupCommandWrapper extends CommandWrapper<
     private static final String ATTACH_QCOW2_DISK_COMMAND = " virsh attach-disk %s %s %s --driver qemu --subdriver qcow2 --cache none";
     private static final String ATTACH_RBD_DISK_XML_COMMAND = " virsh attach-device %s /dev/stdin <<EOF%sEOF";
     private static final String CURRRENT_DEVICE = "virsh domblklist --domain %s | tail -n 3 | head -n 1 | awk '{print $1}'";
-    private static final String RSYNC_COMMAND = "rsync -az %s %s";
     private static final String MKDIR_P = "mkdir -p %s";
     private static final String RSYNC_DIR_FROM_REMOTE = "rsync -az -e \"ssh -o StrictHostKeyChecking=no\" %s:%s/ %s/";
 
@@ -201,20 +200,6 @@ private String getLegacyBackupFileName(String diskType, String volumeUuid) {
         return String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), volumeUuid);
     }
 
-    private boolean checkBackupFileImage(String backupPath) {
-        int exitValue = Script.runSimpleBashScriptForExitValue(String.format("qemu-img check %s", backupPath));
-        return exitValue == 0;
-    }
-
-    private boolean checkBackupPathExists(String backupPath) {
-        int exitValue = Script.runSimpleBashScriptForExitValue(String.format("ls %s", backupPath));
-        return exitValue == 0;
-    }
-
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, null, 0, false);
-    }
-
     private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
                                             String backupRootPath, int backupIndex) {
         return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, backupRootPath, backupIndex, false);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 72997d7c249a..52be28df2f94 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -68,11 +68,8 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
         String backupRepoType = command.getBackupRepoType();
         String mountOptions = command.getMountOptions();
         Boolean vmExists = command.isVmExists();
-        String diskType = command.getDiskType();
-        List<String> backedVolumeUUIDs = command.getBackupVolumesUUIDs();
         List<PrimaryDataStoreTO> restoreVolumePools = command.getRestoreVolumePools();
         List<String> restoreVolumePaths = command.getRestoreVolumePaths();
-        // String restoreVolumeUuid = command.getRestoreVolumeUUID();
         Integer mountTimeout = command.getMountTimeout() * 1000;
         int timeout = command.getWait() > 0 ? command.getWait() : command.getMountTimeout();
         String cacheMode = command.getCacheMode();
@@ -239,20 +236,6 @@ private List<String> getMountedBackupPaths(String mountDirectory, String backupP
         return mountedPaths;
     }
 
-    private boolean checkBackupFileImage(String backupPath) {
-        int exitValue = Script.runSimpleBashScriptForExitValue(String.format("qemu-img check %s", backupPath));
-        return exitValue == 0;
-    }
-
-    private boolean checkBackupPathExists(String backupPath) {
-        int exitValue = Script.runSimpleBashScriptForExitValue(String.format("ls %s", backupPath));
-        return exitValue == 0;
-    }
-
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, null, 0, false);
-    }
-
     private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
                                             String backupRootPath, int backupIndex) {
         return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, backupRootPath, backupIndex, false);

From 83992e473dfd7d3a5cfda8269a3c1312b005307a Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 15:23:06 +0900
Subject: [PATCH 63/93] =?UTF-8?q?=EB=B3=B5=EC=9B=90=EC=8B=9C=20=EC=8A=A4?=
 =?UTF-8?q?=EB=83=85=EC=83=B7=20=EC=9E=AC=EA=B5=AC=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...tCommvaultRestoreBackupCommandWrapper.java | 169 +++++++++++++++--
 .../LibvirtRestoreBackupCommandWrapper.java   | 173 ++++++++++++++++--
 2 files changed, 308 insertions(+), 34 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index 7906a10261bc..a99e4f1af845 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -49,6 +49,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 
 @ResourceWrapper(handles = CommvaultRestoreBackupCommand.class)
@@ -383,18 +384,45 @@ private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePo
         }
 
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
-        for (int index = 1; index < backupPaths.size(); index++) {
-            String backupPath = backupPaths.get(index);
-            if (!backupPath.endsWith(".rbdiff")) {
-                continue;
+        List<String> restoreSnapshots = new ArrayList<>();
+        try {
+            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
+            String baseCheckpoint = baseMetadata.get("checkpoint_name");
+            if (StringUtils.isNotBlank(baseCheckpoint)) {
+                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, baseCheckpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(baseCheckpoint);
             }
-            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
-            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
-                return false;
+
+            for (int index = 1; index < backupPaths.size(); index++) {
+                String backupPath = backupPaths.get(index);
+                if (!backupPath.endsWith(".rbdiff")) {
+                    continue;
+                }
+                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
+                String parentCheckpoint = metadata.get("parent_checkpoint_name");
+                String checkpoint = metadata.get("checkpoint_name");
+                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
+                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
+                }
+                if (!rbdSnapshotExists(volumeStoragePool, normalizedVolumePath, parentCheckpoint, timeout)) {
+                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on volume %s", parentCheckpoint, normalizedVolumePath));
+                }
+                String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
+                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                    logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
+                    return false;
+                }
+                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, checkpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(checkpoint);
             }
+            return true;
+        } finally {
+            cleanupRbdRestoreSnapshots(volumeStoragePool, normalizedVolumePath, restoreSnapshots, timeout);
         }
-        return true;
     }
 
     private String normalizeRbdVolumePath(String volumePath, KVMStoragePool storagePool) {
@@ -467,20 +495,127 @@ private boolean importBackupChainToTemporaryRbd(List<String> backupPaths, int ti
             logger.error("Failed to import base RBD backup {} into temporary image {}", backupPaths.get(0), tempImage);
             return false;
         }
-        for (int index = 1; index < backupPaths.size(); index++) {
-            String backupPath = backupPaths.get(index);
-            if (!backupPath.endsWith(".rbdiff")) {
-                continue;
+        List<String> restoreSnapshots = new ArrayList<>();
+        try {
+            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
+            String baseCheckpoint = baseMetadata.get("checkpoint_name");
+            if (StringUtils.isNotBlank(baseCheckpoint)) {
+                if (!ensureRbdSnapshotExists(sourceImage, tempImage, baseCheckpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(baseCheckpoint);
             }
-            String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
-            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
-                return false;
+            for (int index = 1; index < backupPaths.size(); index++) {
+                String backupPath = backupPaths.get(index);
+                if (!backupPath.endsWith(".rbdiff")) {
+                    continue;
+                }
+                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
+                String parentCheckpoint = metadata.get("parent_checkpoint_name");
+                String checkpoint = metadata.get("checkpoint_name");
+                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
+                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
+                }
+                if (!rbdSnapshotExists(sourceImage, tempImage, parentCheckpoint, timeout)) {
+                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on temporary image %s", parentCheckpoint, tempImage));
+                }
+                String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
+                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                    logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
+                    return false;
+                }
+                if (!ensureRbdSnapshotExists(sourceImage, tempImage, checkpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(checkpoint);
             }
+            return true;
+        } finally {
+            cleanupRbdRestoreSnapshots(sourceImage, tempImage, restoreSnapshots, timeout);
+        }
+    }
+
+    private Map<String, String> readRbdBackupMetadata(String backupPath) {
+        java.nio.file.Path metadataPath = Paths.get(backupPath).getParent().resolve("rbd-backup.meta");
+        if (!Files.exists(metadataPath)) {
+            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
+        }
+        try {
+            return Files.readAllLines(metadataPath).stream()
+                    .map(String::trim)
+                    .filter(line -> !line.isEmpty() && line.contains("="))
+                    .map(line -> line.split("=", 2))
+                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
+        }
+    }
+
+    private boolean ensureRbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
+        if (rbdSnapshotExists(storagePool, volumePath, snapshotName, timeout)) {
+            return true;
+        }
+        String createSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap create", volumePath + "@" + snapshotName);
+        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to create RBD snapshot {} on volume {}", snapshotName, volumePath);
+            return false;
         }
         return true;
     }
 
+    private boolean ensureRbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
+        if (rbdSnapshotExists(imageSpec, image, snapshotName, timeout)) {
+            return true;
+        }
+        String createSnapshotCommand = imageSpec.buildRbdCommand("snap", "create", quote(image + "@" + snapshotName));
+        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to create RBD snapshot {} on image {}", snapshotName, image);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean rbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
+        String existsCommand = buildRbdSnapshotCommand(storagePool, "snap ls", volumePath) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
+        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
+    }
+
+    private boolean rbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
+        String existsCommand = imageSpec.buildRbdCommand("snap", "ls", quote(image)) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
+        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
+    }
+
+    private void cleanupRbdRestoreSnapshots(KVMStoragePool storagePool, String volumePath, List<String> snapshotNames, int timeout) {
+        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
+            String snapshotName = snapshotNames.get(index);
+            String removeSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap rm", volumePath + "@" + snapshotName);
+            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
+        }
+    }
+
+    private void cleanupRbdRestoreSnapshots(RbdImageSpec imageSpec, String image, List<String> snapshotNames, int timeout) {
+        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
+            String snapshotName = snapshotNames.get(index);
+            String removeSnapshotCommand = imageSpec.buildRbdCommand("snap", "rm", quote(image + "@" + snapshotName));
+            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
+        }
+    }
+
+    private String buildRbdSnapshotCommand(KVMStoragePool storagePool, String action, String target) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" ").append(action).append(" ").append(target);
+        return command.toString();
+    }
+
     private void removeTemporaryRbdImage(RbdImageSpec sourceImage, String tempImage, int timeout) {
         String removeCommand = sourceImage.buildRbdCommand("rm", quote(tempImage));
         Script.runSimpleBashScriptForExitValue(removeCommand, timeout * 1000, false);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 52be28df2f94..8964f9e29a9f 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -409,18 +409,48 @@ private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePo
         }
 
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
-        for (int index = 1; index < backupPaths.size(); index++) {
-            String backupPath = backupPaths.get(index);
-            if (!backupPath.endsWith(".rbdiff")) {
-                continue;
+        List<String> restoreSnapshots = new ArrayList<>();
+        try {
+            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
+            String baseCheckpoint = baseMetadata.get("checkpoint_name");
+            if (StringUtils.isNotBlank(baseCheckpoint)) {
+                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, baseCheckpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(baseCheckpoint);
             }
-            String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
-            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
-                return false;
+
+            for (int index = 1; index < backupPaths.size(); index++) {
+                String backupPath = backupPaths.get(index);
+                if (!backupPath.endsWith(".rbdiff")) {
+                    continue;
+                }
+
+                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
+                String parentCheckpoint = metadata.get("parent_checkpoint_name");
+                String checkpoint = metadata.get("checkpoint_name");
+                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
+                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
+                }
+                if (!rbdSnapshotExists(volumeStoragePool, normalizedVolumePath, parentCheckpoint, timeout)) {
+                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on volume %s", parentCheckpoint, normalizedVolumePath));
+                }
+
+                String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
+                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                    logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
+                    return false;
+                }
+
+                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, checkpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(checkpoint);
             }
+            return true;
+        } finally {
+            cleanupRbdRestoreSnapshots(volumeStoragePool, normalizedVolumePath, restoreSnapshots, timeout);
         }
-        return true;
     }
 
     private String normalizeRbdVolumePath(String volumePath, KVMStoragePool storagePool) {
@@ -493,20 +523,129 @@ private boolean importBackupChainToTemporaryRbd(List<String> backupPaths, int ti
             logger.error("Failed to import base RBD backup {} into temporary image {}", backupPaths.get(0), tempImage);
             return false;
         }
-        for (int index = 1; index < backupPaths.size(); index++) {
-            String backupPath = backupPaths.get(index);
-            if (!backupPath.endsWith(".rbdiff")) {
-                continue;
+
+        List<String> restoreSnapshots = new ArrayList<>();
+        try {
+            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
+            String baseCheckpoint = baseMetadata.get("checkpoint_name");
+            if (StringUtils.isNotBlank(baseCheckpoint)) {
+                if (!ensureRbdSnapshotExists(sourceImage, tempImage, baseCheckpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(baseCheckpoint);
             }
-            String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
-            if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
-                return false;
+
+            for (int index = 1; index < backupPaths.size(); index++) {
+                String backupPath = backupPaths.get(index);
+                if (!backupPath.endsWith(".rbdiff")) {
+                    continue;
+                }
+                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
+                String parentCheckpoint = metadata.get("parent_checkpoint_name");
+                String checkpoint = metadata.get("checkpoint_name");
+                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
+                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
+                }
+                if (!rbdSnapshotExists(sourceImage, tempImage, parentCheckpoint, timeout)) {
+                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on temporary image %s", parentCheckpoint, tempImage));
+                }
+                String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
+                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                    logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
+                    return false;
+                }
+                if (!ensureRbdSnapshotExists(sourceImage, tempImage, checkpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(checkpoint);
             }
+            return true;
+        } finally {
+            cleanupRbdRestoreSnapshots(sourceImage, tempImage, restoreSnapshots, timeout);
+        }
+    }
+
+    private Map<String, String> readRbdBackupMetadata(String backupPath) {
+        java.nio.file.Path metadataPath = Paths.get(backupPath).getParent().resolve("rbd-backup.meta");
+        if (!Files.exists(metadataPath)) {
+            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
+        }
+        try {
+            return Files.readAllLines(metadataPath).stream()
+                    .map(String::trim)
+                    .filter(line -> !line.isEmpty() && line.contains("="))
+                    .map(line -> line.split("=", 2))
+                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
+        }
+    }
+
+    private boolean ensureRbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
+        if (rbdSnapshotExists(storagePool, volumePath, snapshotName, timeout)) {
+            return true;
+        }
+        String createSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap create", volumePath + "@" + snapshotName);
+        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to create RBD snapshot {} on volume {}", snapshotName, volumePath);
+            return false;
         }
         return true;
     }
 
+    private boolean ensureRbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
+        if (rbdSnapshotExists(imageSpec, image, snapshotName, timeout)) {
+            return true;
+        }
+        String createSnapshotCommand = imageSpec.buildRbdCommand("snap", "create", quote(image + "@" + snapshotName));
+        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to create RBD snapshot {} on image {}", snapshotName, image);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean rbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
+        String existsCommand = buildRbdSnapshotCommand(storagePool, "snap ls", volumePath) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
+        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
+    }
+
+    private boolean rbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
+        String existsCommand = imageSpec.buildRbdCommand("snap", "ls", quote(image)) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
+        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
+    }
+
+    private void cleanupRbdRestoreSnapshots(KVMStoragePool storagePool, String volumePath, List<String> snapshotNames, int timeout) {
+        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
+            String snapshotName = snapshotNames.get(index);
+            String removeSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap rm", volumePath + "@" + snapshotName);
+            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
+        }
+    }
+
+    private void cleanupRbdRestoreSnapshots(RbdImageSpec imageSpec, String image, List<String> snapshotNames, int timeout) {
+        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
+            String snapshotName = snapshotNames.get(index);
+            String removeSnapshotCommand = imageSpec.buildRbdCommand("snap", "rm", quote(image + "@" + snapshotName));
+            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
+        }
+    }
+
+    private String buildRbdSnapshotCommand(KVMStoragePool storagePool, String action, String target) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" ").append(action).append(" ").append(target);
+        return command.toString();
+    }
+
     private void removeTemporaryRbdImage(RbdImageSpec sourceImage, String tempImage, int timeout) {
         String removeCommand = sourceImage.buildRbdCommand("rm", quote(tempImage));
         Script.runSimpleBashScriptForExitValue(removeCommand, timeout * 1000, false);

From 3278df84401ace0c124f53e6605f28bc7e8494fc Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Wed, 8 Apr 2026 17:50:57 +0900
Subject: [PATCH 64/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=20=EB=AA=A8=EB=8B=AC?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20Commvault=EC=97=90=EB=8F=84=20=EB=B0=B1?=
 =?UTF-8?q?=EC=97=85=20=EC=9D=B4=EB=A6=84=EA=B3=BC=20=EC=84=A4=EB=AA=85=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/views/compute/StartBackup.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/src/views/compute/StartBackup.vue b/ui/src/views/compute/StartBackup.vue
index 96c337ab0bd0..3f281f480a54 100644
--- a/ui/src/views/compute/StartBackup.vue
+++ b/ui/src/views/compute/StartBackup.vue
@@ -88,7 +88,7 @@ export default {
   },
   computed: {
     canSetNameAndDescription () {
-      return ['nas', 'dummy'].includes(this.provider)
+      return ['nas', 'commvault', 'dummy'].includes(this.provider)
     }
   },
   methods: {
@@ -100,7 +100,6 @@ export default {
       this.loading = true
       getAPI('listBackupOfferings', { id: this.resource.backupofferingid }).then(json => {
         this.provider = json.listbackupofferingsresponse.backupoffering[0].provider
-        console.log('this.provider', this.provider)
       }).finally(() => {
         this.loading = false
       })

From 2aa9970d9b7d4d3697d09e1878486cdd00ffbf24 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 09:58:58 +0900
Subject: [PATCH 65/93] =?UTF-8?q?commvault=20=EB=B0=B1=EC=97=85=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=EC=8B=9C=20rbd=EC=9D=B8=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=20=EC=8A=A4=EB=83=85=EC=83=B7=20=EC=82=AD=EC=A0=9C=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=B6=94=EA=B0=80,=20=EB=B0=B1=EC=97=85=20?=
 =?UTF-8?q?=EC=B2=B4=EC=9D=B8=20=EC=9E=88=EB=8A=94=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/DeleteBackupCommand.java           | 27 ++++++++
 .../backup/CommvaultBackupProvider.java       | 59 ++++++++++++++++-
 .../cloudstack/backup/NASBackupProvider.java  | 15 ++++-
 .../LibvirtDeleteBackupCommandWrapper.java    | 56 +++++++++++++---
 scripts/vm/hypervisor/kvm/cvtbackup.sh        | 65 +++++++++++++++++++
 scripts/vm/hypervisor/kvm/nasbackup.sh        |  3 +
 6 files changed, 211 insertions(+), 14 deletions(-)

diff --git a/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
index 2b173fd2fdec..7221bfc363bd 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
@@ -26,6 +26,9 @@ public class DeleteBackupCommand extends Command {
     private String backupPath;
     private String backupRepoType;
     private String backupRepoAddress;
+    private String backupProvider;
+    private String checkpointName;
+    private String diskPaths;
     private boolean forced;
     @LogLevel(LogLevel.Log4jLevel.Off)
     private String mountOptions;
@@ -63,6 +66,30 @@ public void setBackupRepoAddress(String backupRepoAddress) {
         this.backupRepoAddress = backupRepoAddress;
     }
 
+    public String getBackupProvider() {
+        return backupProvider;
+    }
+
+    public void setBackupProvider(String backupProvider) {
+        this.backupProvider = backupProvider;
+    }
+
+    public String getCheckpointName() {
+        return checkpointName;
+    }
+
+    public void setCheckpointName(String checkpointName) {
+        this.checkpointName = checkpointName;
+    }
+
+    public String getDiskPaths() {
+        return diskPaths;
+    }
+
+    public void setDiskPaths(String diskPaths) {
+        this.diskPaths = diskPaths;
+    }
+
     public String getMountOptions() {
         return mountOptions == null ? "" : mountOptions;
     }
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index d1ebd52c63d1..d5bcc2168fcf 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -111,6 +111,7 @@ public class CommvaultBackupProvider extends AdapterBase implements BackupProvid
     private static final String DETAIL_PARENT_CHECKPOINT_NAME = "commvault.parent.checkpoint.name";
     private static final String DETAIL_PARENT_CHECKPOINT_PATH = "commvault.parent.checkpoint.path";
     private static final String DETAIL_BACKUP_ENGINE = "commvault.backup.engine";
+    private static final String DETAIL_RBD_DISK_PATHS = "commvault.rbd.disk.paths";
     private static final String MISSING_PARENT_RBD_SNAPSHOT_ERROR = "Parent RBD snapshot";
     private static final String DETAIL_STAGE_HOST = "commvault.stage.host";
     private static final String RM_COMMAND = "rm -rf %s";
@@ -373,6 +374,16 @@ private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {
         return chainSize;
     }
 
+    private boolean hasDependentBackups(Backup backup) {
+        List<Backup> backups = backupDao.listByVmId(null, backup.getVmId());
+        return backups.stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(candidate -> !Objects.equals(candidate.getId(), backup.getId()))
+                .peek(backupDao::loadDetails)
+                .anyMatch(candidate -> Objects.equals(getBackupDetail(candidate, DETAIL_PARENT_BACKUP_UUID), backup.getUuid()));
+    }
+
     private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, Map<String, String> details) {
         BackupVO backup = new BackupVO();
         backup.setVmId(vm.getId());
@@ -402,12 +413,15 @@ private Map<String, String> getBackupDetails(VirtualMachine vm, String backupPat
         Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
         details.put(DETAIL_BACKUP_ENGINE, backupEngine);
         details.put(DETAIL_STAGE_HOST, stageHost);
+        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
+        details.put(DETAIL_CHECKPOINT_PATH, getCheckpointPath(backupPath, checkpointName, backupEngine));
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            details.put(DETAIL_RBD_DISK_PATHS, String.join(",", getVolumePoolsAndPaths(volumeDao.findByInstance(vm.getId())).second()));
+        }
         if (!incrementalBackup) {
             return details;
         }
 
-        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
-        details.put(DETAIL_CHECKPOINT_PATH, String.format("%s/checkpoints/%s.xml", backupPath, checkpointName));
         details.put(DETAIL_PARENT_BACKUP_UUID, latestBackup.getUuid());
         details.put(DETAIL_PARENT_BACKUP_PATH, latestBackup.getExternalId().substring(0, latestBackup.getExternalId().lastIndexOf(',')));
         details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(latestBackup, DETAIL_CHECKPOINT_NAME));
@@ -415,6 +429,13 @@ private Map<String, String> getBackupDetails(VirtualMachine vm, String backupPat
         return details;
     }
 
+    private String getCheckpointPath(String backupPath, String checkpointName, String backupEngine) {
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            return String.format("%s/checkpoints/%s.meta", backupPath, checkpointName);
+        }
+        return String.format("%s/checkpoints/%s.xml", backupPath, checkpointName);
+    }
+
     private String getBackupDetail(Backup backup, String key) {
         return backup == null ? null : backup.getDetail(key);
     }
@@ -1011,6 +1032,10 @@ private Optional<Backup.VolumeInfo> getBackedUpVolumeInfo(List<Backup.VolumeInfo
 
     @Override
     public boolean deleteBackup(Backup backup, boolean forced) {
+        loadBackupDetailsIfNeeded(backup);
+        if (!forced && hasDependentBackups(backup)) {
+            throw new CloudRuntimeException(String.format("Backup [%s] cannot be deleted because one or more incremental backups depend on it.", backup.getUuid()));
+        }
         final Long zoneId = backup.getZoneId();
         final String externalId = backup.getExternalId();
         String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
@@ -1025,7 +1050,11 @@ public boolean deleteBackup(Backup backup, boolean forced) {
             String clientId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("clientId"));
             String clientName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("clientName"));
             String backupsetId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("backupsetId"));
-            return client.deleteBackup(subclientId, applicationId, applicationId, clientId, clientName, backupsetId, path);
+            boolean result = client.deleteBackup(subclientId, applicationId, applicationId, clientId, clientName, backupsetId, path);
+            if (result) {
+                cleanupBackupPathOnStageHost(clientName, path, forced, getBackupDetail(backup, DETAIL_CHECKPOINT_NAME), getBackupDetail(backup, DETAIL_RBD_DISK_PATHS));
+            }
+            return result;
         } else {
             throw new CloudRuntimeException("Failed to request backup job detail commvault api");
         }
@@ -1159,6 +1188,7 @@ public void syncBackups(VirtualMachine vm) {
         }
         final CommvaultClient client = getClient(vm.getDataCenterId());
         for (final Backup backup: backupDao.listByVmId(vm.getDataCenterId(), vm.getId())) {
+            loadBackupDetailsIfNeeded(backup);
             String externalId = backup.getExternalId();
             String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
             String path = externalId.substring(0, externalId.lastIndexOf(','));
@@ -1183,6 +1213,7 @@ public void syncBackups(VirtualMachine vm) {
                     String backupsetId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("backupsetId"));
                     boolean result = client.deleteBackup(subclientId, applicationId, applicationId, clientId, clientName, backupsetId, path);
                     if (result) {
+                        cleanupBackupPathOnStageHost(clientName, path, false, getBackupDetail(backup, DETAIL_CHECKPOINT_NAME), getBackupDetail(backup, DETAIL_RBD_DISK_PATHS));
                         backupDao.remove(backup.getId());
                     }
                 }
@@ -1402,6 +1433,28 @@ private boolean executeDeleteBackupPathCommand(HostVO host, String username, Str
         return false;
     }
 
+    private void cleanupBackupPathOnStageHost(String clientName, String path, boolean forced, String checkpointName, String diskPaths) {
+        HostVO stageHost = hostDao.findByName(clientName);
+        if (stageHost == null) {
+            throw new CloudRuntimeException(String.format("Unable to find stage host [%s] for backup cleanup", clientName));
+        }
+        DeleteBackupCommand command = new DeleteBackupCommand(path, null, null, null, forced);
+        command.setBackupProvider("commvault");
+        command.setCheckpointName(checkpointName);
+        command.setDiskPaths(diskPaths);
+        try {
+            BackupAnswer answer = (BackupAnswer) agentManager.send(stageHost.getId(), command);
+            if (answer == null || !answer.getResult()) {
+                throw new CloudRuntimeException(String.format("Failed to delete Commvault backup path on host %s due to: %s",
+                        stageHost.getName(), answer != null ? answer.getDetails() : "no answer received"));
+            }
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control plane to delete Commvault backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to delete Commvault backup timed out, please try again");
+        }
+    }
+
     public static boolean isRetentionExpired(String retainedUntil) {
         if (retainedUntil == null || retainedUntil.trim().isEmpty() || "null".equals(retainedUntil)) {
             return false;
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index 7bfeabf46106..a1df322ef2ad 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -94,6 +94,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
     private static final String DETAIL_PARENT_CHECKPOINT_NAME = "nas.parent.checkpoint.name";
     private static final String DETAIL_PARENT_CHECKPOINT_PATH = "nas.parent.checkpoint.path";
     private static final String DETAIL_BACKUP_ENGINE = "nas.backup.engine";
+    private static final String DETAIL_RBD_DISK_PATHS = "nas.rbd.disk.paths";
     private static final String MISSING_PARENT_RBD_SNAPSHOT_ERROR = "Parent RBD snapshot";
 
     ConfigKey<Integer> NASBackupRestoreMountTimeout = new ConfigKey<>("Advanced", Integer.class,
@@ -246,7 +247,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
         final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
 
         BackupVO backupVO = createBackupObject(vm, backupPath, incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL,
-                checkpointName, backupEngine, incrementalBackup ? parentBackup : null);
+                checkpointName, backupEngine, incrementalBackup ? parentBackup : null, volumePoolsAndPaths.second());
         TakeBackupCommand command = new TakeBackupCommand(vm.getInstanceName(), backupPath);
         command.setBackupType(backupVO.getType());
         command.setCheckpointName(checkpointName);
@@ -354,7 +355,8 @@ private void validateNoVmSnapshots(VirtualMachine vm) {
         }
     }
 
-    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, String checkpointName, String backupEngine, Backup parentBackup) {
+    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, String checkpointName, String backupEngine, Backup parentBackup,
+                                        List<String> diskPaths) {
         BackupVO backup = new BackupVO();
         backup.setVmId(vm.getId());
         backup.setExternalId(backupPath);
@@ -381,6 +383,9 @@ private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String
         details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
         details.put(DETAIL_CHECKPOINT_PATH, getCheckpointPath(backupPath, checkpointName, backupEngine));
         details.put(DETAIL_BACKUP_ENGINE, backupEngine);
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine) && CollectionUtils.isNotEmpty(diskPaths)) {
+            details.put(DETAIL_RBD_DISK_PATHS, String.join(",", diskPaths));
+        }
         if (parentBackup != null) {
             details.put(DETAIL_PARENT_BACKUP_UUID, parentBackup.getUuid());
             details.put(DETAIL_PARENT_BACKUP_PATH, parentBackup.getExternalId());
@@ -843,6 +848,9 @@ private Backup.VolumeInfo getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUp
 
     @Override
     public boolean deleteBackup(Backup backup, boolean forced) {
+        if (backup instanceof BackupVO && backup.getDetails() == null) {
+            backupDao.loadDetails((BackupVO) backup);
+        }
         if (!forced && hasDependentBackups(backup)) {
             throw new CloudRuntimeException(String.format("Backup [%s] cannot be deleted because one or more incremental backups depend on it.", backup.getUuid()));
         }
@@ -862,6 +870,9 @@ public boolean deleteBackup(Backup backup, boolean forced) {
 
         DeleteBackupCommand command = new DeleteBackupCommand(backup.getExternalId(), backupRepository.getType(),
                 backupRepository.getAddress(), backupRepository.getMountOptions(), forced);
+        command.setBackupProvider("nas");
+        command.setCheckpointName(getBackupDetail(backup, DETAIL_CHECKPOINT_NAME));
+        command.setDiskPaths(getBackupDetail(backup, DETAIL_RBD_DISK_PATHS));
 
         BackupAnswer answer;
         try {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
index 1ef9c501fbbc..deaf1f6c2abe 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
@@ -27,6 +27,7 @@
 import com.cloud.utils.script.Script;
 import org.apache.cloudstack.backup.BackupAnswer;
 import org.apache.cloudstack.backup.DeleteBackupCommand;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -39,18 +40,55 @@ public Answer execute(DeleteBackupCommand command, LibvirtComputingResource libv
         final String backupRepoType = command.getBackupRepoType();
         final String backupRepoAddress = command.getBackupRepoAddress();
         final String mountOptions = command.getMountOptions();
+        final String backupProvider = command.getBackupProvider();
+        final String checkpointName = command.getCheckpointName();
+        final String diskPaths = command.getDiskPaths();
         final boolean forced = command.isForced();
 
         List<String[]> commands = new ArrayList<>();
-        commands.add(new String[]{
-                libvirtComputingResource.getNasBackupPath(),
-                "-o", "delete",
-                "-t", backupRepoType,
-                "-s", backupRepoAddress,
-                "-m", mountOptions,
-                "-p", backupPath,
-                "-x", Boolean.toString(forced)
-        });
+        if ("commvault".equalsIgnoreCase(backupProvider)) {
+            List<String> deleteCommand = new ArrayList<>();
+            deleteCommand.add(libvirtComputingResource.getCvtBackupPath());
+            deleteCommand.add("-o");
+            deleteCommand.add("delete");
+            deleteCommand.add("-p");
+            deleteCommand.add(backupPath);
+            deleteCommand.add("-x");
+            deleteCommand.add(Boolean.toString(forced));
+            if (StringUtils.isNotBlank(checkpointName)) {
+                deleteCommand.add("-c");
+                deleteCommand.add(checkpointName);
+            }
+            if (StringUtils.isNotBlank(diskPaths)) {
+                deleteCommand.add("-d");
+                deleteCommand.add(diskPaths);
+            }
+            commands.add(deleteCommand.toArray(new String[0]));
+        } else {
+            List<String> deleteCommand = new ArrayList<>();
+            deleteCommand.add(libvirtComputingResource.getNasBackupPath());
+            deleteCommand.add("-o");
+            deleteCommand.add("delete");
+            deleteCommand.add("-t");
+            deleteCommand.add(backupRepoType);
+            deleteCommand.add("-s");
+            deleteCommand.add(backupRepoAddress);
+            deleteCommand.add("-m");
+            deleteCommand.add(mountOptions);
+            deleteCommand.add("-p");
+            deleteCommand.add(backupPath);
+            deleteCommand.add("-x");
+            deleteCommand.add(Boolean.toString(forced));
+            if (StringUtils.isNotBlank(checkpointName)) {
+                deleteCommand.add("-c");
+                deleteCommand.add(checkpointName);
+            }
+            if (StringUtils.isNotBlank(diskPaths)) {
+                deleteCommand.add("-d");
+                deleteCommand.add(diskPaths);
+            }
+            commands.add(deleteCommand.toArray(new String[0]));
+        }
 
         Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
 
diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/cvtbackup.sh
index 9b9fd8597470..35d5b1c3a562 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/cvtbackup.sh
@@ -13,6 +13,7 @@ PARENT_BACKUP_DIR=""
 PARENT_CHECKPOINT_NAME=""
 PARENT_CHECKPOINT_PATH=""
 BACKUP_FILES=""
+FORCED="false"
 logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
@@ -191,6 +192,16 @@ EOF
   log -ne "Wrote RBD backup metadata to [$dest/rbd-backup.meta]"
 }
 
+write_rbd_checkpoint_metadata() {
+  local checkpoint_name="$1"
+  local parent_checkpoint_name="$2"
+
+  cat > "$dest/checkpoints/$checkpoint_name.meta" <<EOF
+checkpoint_name=$checkpoint_name
+parent_checkpoint_name=$parent_checkpoint_name
+EOF
+}
+
 backup_running_vm() {
   mkdir -p "$dest/checkpoints" || { echo "Failed to create backup directory $dest"; exit 1; }
   local parent_checkpoint_file=""
@@ -311,6 +322,57 @@ backup_rbd_volumes() {
   done < <(split_csv "$DISK_PATHS")
 
   write_rbd_backup_metadata "$BACKUP_TYPE" "$CHECKPOINT_NAME" "$PARENT_CHECKPOINT_NAME"
+  write_rbd_checkpoint_metadata "$CHECKPOINT_NAME" "$PARENT_CHECKPOINT_NAME"
+}
+
+has_child_backup() {
+  local checkpoint_name="$1"
+  [[ -z "$checkpoint_name" ]] && return 1
+  grep -R -q "^parent_checkpoint_name=$checkpoint_name$" "$(dirname "$dest")"/*/rbd-backup.meta 2>/dev/null
+}
+
+delete_rbd_snapshot_if_unreferenced() {
+  local disk_paths="$1"
+  local checkpoint_name="$2"
+
+  [[ -z "$checkpoint_name" ]] && return 0
+
+  if has_child_backup "$checkpoint_name"; then
+    log -ne "Skip snapshot delete [$checkpoint_name] (child exists)"
+    return 0
+  fi
+
+  while IFS= read -r disk_path; do
+    [[ -z "$disk_path" ]] && continue
+    parse_rbd_uri "$disk_path"
+    build_rbd_cmd
+
+    if timeout 30s "${RBD_CMD[@]}" snap ls "$RBD_IMAGE" 2>/dev/null | awk 'NR>1 {print $2}' | grep -Fxq "$checkpoint_name"; then
+      log -ne "Deleting snapshot [${RBD_IMAGE}@${checkpoint_name}]"
+      "${RBD_CMD[@]}" snap rm "${RBD_IMAGE}@${checkpoint_name}" >> "$logFile" 2>&1 || true
+    fi
+  done < <(split_csv "$disk_paths")
+}
+
+delete_backup() {
+  if [[ -f "$dest/rbd-backup.meta" ]]; then
+    source "$dest/rbd-backup.meta"
+
+    log -ne "Deleting backup with metadata [$dest]"
+
+    if [[ "$FORCED" != "true" ]] && has_child_backup "$checkpoint_name"; then
+      echo "Cannot delete backup [$backup_dir]: child backup exists"
+      exit 1
+    fi
+
+    delete_rbd_snapshot_if_unreferenced "$disk_paths" "$checkpoint_name"
+  elif [[ -n "$CHECKPOINT_NAME" && -n "$DISK_PATHS" ]]; then
+    log -ne "Deleting backup using command metadata [$dest]"
+    delete_rbd_snapshot_if_unreferenced "$DISK_PATHS" "$CHECKPOINT_NAME"
+  fi
+
+  rm -frv "$dest"
+  sync
 }
 
 usage() {
@@ -333,6 +395,7 @@ while [[ $# -gt 0 ]]; do
     -f|--backupfiles) BACKUP_FILES="$2"; shift; shift ;;
     -q|--quiesce) QUIESCE="$2"; shift; shift ;;
     -d|--diskpaths) DISK_PATHS="$2"; shift; shift ;;
+    -x|--forced) FORCED="$2"; shift; shift ;;
     -h|--help) usage ;;
     *) echo "Invalid option: $1"; usage ;;
   esac
@@ -352,6 +415,8 @@ if [[ "$OP" == "backup-running" ]]; then
   backup_running_vm
 elif [[ "$OP" == "backup-rbd" ]]; then
   backup_rbd_volumes
+elif [[ "$OP" == "delete" ]]; then
+  delete_backup
 else
   echo "Unsupported operation: $OP"
   exit 1
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 5b655ac1055d..1960720ec7a9 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -346,6 +346,9 @@ delete_backup() {
     fi
 
     delete_rbd_snapshot_if_unreferenced "$disk_paths" "$checkpoint_name"
+  elif [[ -n "$CHECKPOINT_NAME" && -n "$DISK_PATHS" ]]; then
+    log -ne "Deleting backup using command metadata [$dest]"
+    delete_rbd_snapshot_if_unreferenced "$DISK_PATHS" "$CHECKPOINT_NAME"
   fi
 
   rm -frv $dest

From b8c1ce0bb86dbb70594d8cc29449c4fb4eee367a Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 10:03:26 +0900
Subject: [PATCH 66/93] =?UTF-8?q?=EC=B2=B4=ED=81=AC=ED=8F=AC=EC=9D=B8?=
 =?UTF-8?q?=ED=8A=B8=20=EB=84=A4=EC=9E=84=20=ED=86=B5=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index d5bcc2168fcf..06f1e48e6eb9 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -457,7 +457,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
                                                 Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths, Backup latestBackup,
                                                 boolean incrementalBackup, boolean retryAsFullOnFailure) {
         final String requestedBackupType = incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL;
-        final String checkpointName = String.format("backup.%s", UUID.randomUUID());
+        final String checkpointName = backupPath.substring(backupPath.lastIndexOf("/") + 1);
         final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
         final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
         final Map<String, String> backupDetails = getBackupDetails(vm, backupPath, checkpointName, backupEngine, latestBackup, incrementalBackup, vmHost.getName());

From 290dc6b6d85b04783bb91b7d802cdb5c110f0ea3 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 10:48:59 +0900
Subject: [PATCH 67/93] =?UTF-8?q?commvault=20=EB=B3=B5=EC=9B=90=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 06f1e48e6eb9..25265f7062a4 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -740,6 +740,7 @@ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
     }
 
     private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
         try {
             String commvaultServer = getUrlDomain(CommvaultUrl.value());
         } catch (URISyntaxException e) {

From 47654fbabe74d4e782125cbd878e92088a5d9822 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 11:14:57 +0900
Subject: [PATCH 68/93] Update CommvaultBackupProvider.java

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 25265f7062a4..21d5a648ba57 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -159,8 +159,8 @@ public class CommvaultBackupProvider extends AdapterBase implements BackupProvid
 
     private ConfigKey<Integer> CommvaultBackupRestoreTimeout = new ConfigKey<>("Advanced", Integer.class,
             "commvault.backup.restore.timeout",
-            "30",
-            "Timeout in seconds after which qemu-img execute when restoring",
+            "1800",
+            "Timeout in seconds after which Commvault backup restore operations fail.",
             true,
             BackupFrameworkEnabled.key());
 

From b657a39e650ee1c44c6c8d36d5e6d7d7cb71722b Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 12:53:38 +0900
Subject: [PATCH 69/93] Update CommvaultBackupProvider.java

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 21d5a648ba57..87a8277f9606 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -883,6 +883,7 @@ private String getVolumePathPrefix(StoragePoolVO storagePool) {
     // 백업 볼륨 복원 및 연결
     @Override
     public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeInfo backupVolumeInfo, String hostIp, String dataStoreUuid, Pair<String, VirtualMachine.State> vmNameAndState) {
+        loadBackupDetailsIfNeeded(backup);
         try {
             String commvaultServer = getUrlDomain(CommvaultUrl.value());
         } catch (URISyntaxException e) {

From 15557957d57bff9d4851c2fadef9de195ac5859d Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 13:59:46 +0900
Subject: [PATCH 70/93] =?UTF-8?q?=EC=83=88=20=EC=9D=B8=EC=8A=A4=ED=84=B4?=
 =?UTF-8?q?=EC=8A=A4=20=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=EB=84=A4=ED=8A=B8?=
 =?UTF-8?q?=EC=9B=8C=ED=81=AC=20=ED=95=AD=EB=AA=A9=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/components/view/DeployVMFromBackup.vue | 13 ++++++--
 .../views/compute/wizard/NetworkSelection.vue | 30 ++++++++++++++-----
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/ui/src/components/view/DeployVMFromBackup.vue b/ui/src/components/view/DeployVMFromBackup.vue
index 98d4c25f1e26..a406028914f7 100644
--- a/ui/src/components/view/DeployVMFromBackup.vue
+++ b/ui/src/components/view/DeployVMFromBackup.vue
@@ -475,10 +475,10 @@
                     </div>
                     <div v-show="!(vm.templateid && templateNics && templateNics.length > 0)" >
                       <network-selection
-                        :key="`network-selection-${zoneId}-${tabKey}-${form.templateid || 'no-template'}-${form.isoid || 'no-iso'}-${networkOfferingIds.join(',')}`"
+                        :key="`network-selection-${zoneId}-${tabKey}-${form.templateid || 'no-template'}-${form.isoid || 'no-iso'}-${(form.networkids || []).join(',')}`"
                         :items="options.networks"
                         :row-count="rowCount.networks"
-                        :value="networkOfferingIds"
+                        :value="form.networkids || []"
                         :loading="loading.networks"
                         :zoneId="zoneId"
                         :preFillContent="dataPreFill"
@@ -487,7 +487,7 @@
                       ></network-selection>
                       <network-configuration
                         v-if="networks.length > 0"
-                        :key="`network-config-${zoneId}-${tabKey}-${defaultnetworkid}-${networkOfferingIds.join(',')}`"
+                        :key="`network-config-${zoneId}-${tabKey}-${defaultnetworkid}-${(form.networkids || []).join(',')}`"
                         :items="networks"
                         :value="defaultnetworkid"
                         :preFillContent="dataPreFill"
@@ -1457,6 +1457,13 @@ export default {
   created () {
     this.initForm()
     this.dataPreFill = this.preFillContent && Object.keys(this.preFillContent).length > 0 ? this.preFillContent : {}
+    if (Array.isArray(this.dataPreFill.networkids) && this.dataPreFill.networkids.length > 0) {
+      this.form.networkids = [...this.dataPreFill.networkids]
+      if (!this.form.defaultnetworkid) {
+        this.defaultnetworkid = this.dataPreFill.networkids[0]
+        this.form.defaultnetworkid = this.dataPreFill.networkids[0]
+      }
+    }
     this.showOverrideDiskOfferingOption = this.dataPreFill.overridediskoffering
 
     if (this.dataPreFill.isIso) {
diff --git a/ui/src/views/compute/wizard/NetworkSelection.vue b/ui/src/views/compute/wizard/NetworkSelection.vue
index 97db6edc294b..b340d187f96a 100644
--- a/ui/src/views/compute/wizard/NetworkSelection.vue
+++ b/ui/src/views/compute/wizard/NetworkSelection.vue
@@ -227,6 +227,7 @@ export default {
           type: 'checkbox',
           selectedRowKeys: this.selectedRowKeys,
           onChange: (rows) => {
+            this.selectedRowKeys = rows
             this.$emit('select-network-item', rows)
           }
         }
@@ -246,9 +247,15 @@ export default {
     }
   },
   watch: {
-    value (newValue, oldValue) {
-      if (newValue && !_.isEqual(newValue, oldValue)) {
-        this.selectedRowKeys = newValue
+    value: {
+      immediate: true,
+      deep: true,
+      handler (newValue, oldValue) {
+        if (Array.isArray(newValue) && !_.isEqual(newValue, oldValue)) {
+          this.selectedRowKeys = [...newValue]
+        } else if (!newValue || newValue.length === 0) {
+          this.selectedRowKeys = []
+        }
       }
     },
     loading () {
@@ -261,11 +268,7 @@ export default {
       })
       if (!this.loading) {
         if (this.preFillContent.networkids) {
-          const validNetworkIds = this.preFillContent.networkids.filter(networkId =>
-            this.items.some(item => item.id === networkId)
-          )
-          this.selectedRowKeys = validNetworkIds
-          this.$emit('select-network-item', validNetworkIds)
+          this.applyPreFillSelection()
         } else {
           if (this.items && this.items.length > 0) {
             if (this.oldZoneId === this.zoneId) {
@@ -284,6 +287,10 @@ export default {
     items: {
       deep: true,
       handler () {
+        if (this.preFillContent.networkids && this.items && this.items.length > 0) {
+          this.applyPreFillSelection()
+          return
+        }
         if (this.items && this.items.length > 0 &&
           this.networksBeforeCreate) {
           var user = this.$store.getters.userInfo
@@ -326,6 +333,13 @@ export default {
   },
   inject: ['vmFetchNetworks'],
   methods: {
+    applyPreFillSelection () {
+      const validNetworkIds = this.preFillContent.networkids.filter(networkId =>
+        this.items.some(item => item.id === networkId)
+      )
+      this.selectedRowKeys = validNetworkIds
+      this.$emit('select-network-item', validNetworkIds)
+    },
     fetchVPCs () {
       const projectId = store?.getters?.project?.id || null
       if (!projectId) {

From 40d16e34d070bf5f6dbc766ea2fd19d1a46f99ad Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 15:07:11 +0900
Subject: [PATCH 71/93] =?UTF-8?q?=EB=B3=B5=EC=9B=90=20=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/CommvaultBackupProvider.java       | 55 ++++++++-----------
 ...tCommvaultRestoreBackupCommandWrapper.java |  5 --
 .../cloudstack/backup/BackupManagerImpl.java  | 28 +++++++++-
 3 files changed, 47 insertions(+), 41 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 87a8277f9606..4b06f5635f7e 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -337,6 +337,7 @@ private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBacku
         if (latestBackup == null) {
             return false;
         }
+        loadBackupDetailsIfNeeded(latestBackup);
 
         Long clusterId = getClusterIdFromRootVolume(vm);
         if (clusterId == null) {
@@ -347,8 +348,19 @@ private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBacku
             return false;
         }
 
+        return canContinueIncrementalChain(vm, latestBackup, vmHost) && getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+    }
+
+    private boolean canContinueIncrementalChain(VirtualMachine vm, Backup latestBackup, Host vmHost) {
+        final String backupEngine = getBackupDetail(latestBackup, DETAIL_BACKUP_ENGINE);
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            LOG.debug("Allowing Commvault incremental backup for VM [{}] on host [{}] using RBD chain from previous stage host [{}]",
+                    vm.getInstanceName(), vmHost.getName(), getBackupDetail(latestBackup, DETAIL_STAGE_HOST));
+            return true;
+        }
+
         String stageHost = getBackupDetail(latestBackup, DETAIL_STAGE_HOST);
-        return Objects.equals(stageHost, vmHost.getName()) && getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+        return Objects.equals(stageHost, vmHost.getName());
     }
 
     private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {
@@ -792,9 +804,6 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                         .collect(Collectors.toList());
 
                 LOG.debug("Restoring vm {} from backup {} on the Commvault Backup Provider", vm, backup);
-                // 가상머신이 실행중인 호스트 정의
-                final Host vmHost = getVMHypervisorHost(vm);
-                final HostVO vmHostVO = hostDao.findById(vmHost.getId());
                 CommvaultRestoreBackupCommand restoreCommand = new CommvaultRestoreBackupCommand();
                 LOG.info(path);
                 restoreCommand.setBackupPath(path);
@@ -818,12 +827,11 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                 restoreCommand.setVmExists(vm.getRemoved() == null);
                 restoreCommand.setVmState(vm.getState());
                 restoreCommand.setTimeout(CommvaultBackupRestoreTimeout.value());
-                // 복원된 호스트와 가상머신이 실행중인 호스트가 같은 경우 null, 다른 경우 추가
-                restoreCommand.setHostName(restoreHost.getId() == vmHost.getId() ? null : restoreHost.getName());
+                restoreCommand.setHostName(null);
 
                 BackupAnswer answer;
                 try {
-                    answer = (BackupAnswer) agentManager.send(vmHost.getId(), restoreCommand);
+                    answer = (BackupAnswer) agentManager.send(restoreHost.getId(), restoreCommand);
                 } catch (AgentUnavailableException e) {
                     throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
                 } catch (OperationTimedoutException e) {
@@ -831,14 +839,9 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                 }
                 if (!answer.getResult()) {
                     int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
-                    Ternary<String, String, String> credentials = getKVMHyperisorCredentials(vmHostVO);
+                    Ternary<String, String, String> credentials = getKVMHyperisorCredentials(restoreHostVO);
                     String command = String.format(RM_COMMAND, path);
-                    executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, command);
-                    if (restoreHost.getId() != vmHost.getId()) {
-                        credentials = getKVMHyperisorCredentials(restoreHostVO);
-                        command = String.format(RM_COMMAND, path);
-                        executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
-                    }
+                    executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
                 }
                 return new Pair<>(answer.getResult(), answer.getDetails());
             } else {
@@ -922,7 +925,6 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         if (jobId2 != null) {
             String jobStatus = client.getJobStatus(jobId2);
             if (jobStatus.equalsIgnoreCase("Completed")) {
-                final int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
                 final VolumeVO volume = volumeDao.findByUuid(backupVolumeInfo.getUuid());
                 final DiskOffering diskOffering = diskOfferingDao.findByUuid(backupVolumeInfo.getDiskOfferingId());
                 String cacheMode = null;
@@ -936,9 +938,6 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                     }
                 }
                 final StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
-                // 백업 볼륨 복원 및 연결 시 연결할 가상머신이 실행중인 경우 해당 호스트, 정지중인 경우 랜덤 호스트 정의백업
-                final HostVO vmHost = hostDao.findByIp(hostIp);
-                final HostVO vmHostVO = hostDao.findById(vmHost.getId());
                 // 복원된 호스트 정의
                 final HostVO restoreHost = hostDao.findByName(clientName);
                 final HostVO restoreHostVO = hostDao.findById(restoreHost.getId());
@@ -983,12 +982,11 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 restoreCommand.setRestoreVolumeUUID(backupVolumeInfo.getUuid());
                 restoreCommand.setTimeout(CommvaultBackupRestoreTimeout.value());
                 restoreCommand.setCacheMode(cacheMode);
-                // 복원된 호스트와 가상머신이 실행중인 호스트가 같은 경우 null, 다른 경우 추가
-                restoreCommand.setHostName(restoreHost.getId() == vmHost.getId() ? null : restoreHost.getName());
+                restoreCommand.setHostName(null);
 
                 BackupAnswer answer;
                 try {
-                    answer = (BackupAnswer) agentManager.send(vmHost.getId(), restoreCommand);
+                    answer = (BackupAnswer) agentManager.send(restoreHost.getId(), restoreCommand);
                 } catch (AgentUnavailableException e) {
                     throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
                 } catch (OperationTimedoutException e) {
@@ -1001,21 +999,12 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                     } catch (Exception e) {
                         throw new CloudRuntimeException("Unable to create restored volume due to: " + e);
                     }
-                    if (restoreHost.getId() != vmHost.getId()) {
-                        Ternary<String, String, String> credentials = getKVMHyperisorCredentials(restoreHostVO);
-                        String command = String.format(RM_COMMAND, path);
-                        executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
-                    }
                     return new Pair<>(answer.getResult(), answer.getDetails());
                 } else {
-                    Ternary<String, String, String> credentials = getKVMHyperisorCredentials(vmHostVO);
+                    final int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
+                    Ternary<String, String, String> credentials = getKVMHyperisorCredentials(restoreHostVO);
                     String command = String.format(RM_COMMAND, path);
-                    executeDeleteBackupPathCommand(vmHostVO, credentials.first(), credentials.second(), sshPort, command);
-                    if (restoreHost.getId() != vmHost.getId()) {
-                        credentials = getKVMHyperisorCredentials(restoreHostVO);
-                        command = String.format(RM_COMMAND, path);
-                        executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
-                    }
+                    executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
                 }
             } else {
                 LOG.error("Failed to restore backup for VM " + vmNameAndState.first() + " to restore backup job status is " + jobStatus);
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index a99e4f1af845..0e944be823cc 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -149,11 +149,6 @@ private void restoreVolume(KVMStoragePoolManager storagePoolMgr, String backupPa
             if (!replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, localBackupPaths, timeout, backupPath, 0, true)) {
                 throw new CloudRuntimeException(String.format("Unable to restore contents from the backup volume [%s].", volumeUUID));
             }
-            if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
-                if (!attachVolumeToVm(storagePoolMgr, vmNameAndState.first(), volumePool, volumePath, cacheMode)) {
-                    throw new CloudRuntimeException(String.format("Failed to attach volume to VM: %s", vmNameAndState.first()));
-                }
-            }
         } finally {
             deleteBackupDirectory(backupPath);
         }
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index a53cf8ca721a..427858eb0055 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1598,9 +1598,15 @@ public boolean restoreBackupVolumeAndAttachToVM(final String backedUpVolumeUuid,
             throw new CloudRuntimeException(String.format("Error restoring volume [%s] of VM [%s] to host [%s] using backup provider [%s] due to: [%s].",
                     backedUpVolumeUuid, vm.getUuid(), host.getUuid(), backupProvider.getName(), result.second()));
         }
-        if (!attachVolumeToVM(vm.getDataCenterId(), result.second(), backupVolumeInfo,
-                            backedUpVolumeUuid, vm, datastore.getUuid(), backup)) {
-            throw new CloudRuntimeException(String.format("Error attaching volume [%s] to VM [%s].", backedUpVolumeUuid, vm.getUuid()));
+        try {
+            if (!attachVolumeToVM(vm.getDataCenterId(), result.second(), backupVolumeInfo,
+                                backedUpVolumeUuid, vm, datastore.getUuid(), backup)) {
+                cleanupRestoredVolumeAfterAttachFailure(result.second());
+                throw new CloudRuntimeException(String.format("Error attaching volume [%s] to VM [%s].", backedUpVolumeUuid, vm.getUuid()));
+            }
+        } catch (Exception e) {
+            cleanupRestoredVolumeAfterAttachFailure(result.second());
+            throw e;
         }
         return true;
     }
@@ -1723,6 +1729,22 @@ private boolean attachVolumeToVM(Long zoneId, String restoredVolumeLocation, Bac
         }
     }
 
+    private void cleanupRestoredVolumeAfterAttachFailure(String restoredVolumeLocation) {
+        if (StringUtils.isBlank(restoredVolumeLocation)) {
+            return;
+        }
+        VolumeVO restoredVolume = volumeDao.findByUuid(restoredVolumeLocation);
+        if (restoredVolume == null) {
+            return;
+        }
+        try {
+            Account caller = CallContext.current() != null ? CallContext.current().getCallingAccount() : accountDao.findById(restoredVolume.getAccountId());
+            volumeApiService.deleteVolume(restoredVolume.getId(), caller);
+        } catch (Exception e) {
+            logger.warn("Failed to cleanup restored volume {} after attach failure", restoredVolumeLocation, e);
+        }
+    }
+
     private void checkAndGenerateUsageForLastBackupDeletedAfterOfferingRemove(VirtualMachine vm, Backup backup) {
         if (vm != null &&
                 (vm.getBackupOfferingId() == null || vm.getBackupOfferingId() != backup.getBackupOfferingId())) {

From 7777bf09c3206dc24836152bf6c8f6cd8eca89cf Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 16:30:22 +0900
Subject: [PATCH 72/93] =?UTF-8?q?syncBackups=20=EC=98=A4=EB=A5=98=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/CommvaultBackupProvider.java       | 46 +++++++++++++++----
 1 file changed, 37 insertions(+), 9 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 4b06f5635f7e..96e355cce260 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -457,6 +457,24 @@ private String getBackupDetail(Backup backup, String key, String defaultValue) {
         return value == null ? defaultValue : value;
     }
 
+    private Pair<String, String> parseExternalId(String externalId) {
+        if (StringUtils.isBlank(externalId)) {
+            throw new CloudRuntimeException("Backup externalId is empty");
+        }
+
+        final int separatorIndex = externalId.lastIndexOf(',');
+        if (separatorIndex < 0) {
+            throw new CloudRuntimeException(String.format("Invalid Commvault backup externalId format: [%s]", externalId));
+        }
+
+        final String path = externalId.substring(0, separatorIndex);
+        final String jobId = externalId.substring(separatorIndex + 1).trim();
+        if (StringUtils.isAnyBlank(path, jobId)) {
+            throw new CloudRuntimeException(String.format("Invalid Commvault backup externalId format: [%s]", externalId));
+        }
+        return new Pair<>(path, jobId);
+    }
+
     private void validateNoVmSnapshots(VirtualMachine vm) {
         if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVm(vm.getId()))) {
             LOG.debug("Commvault backup provider cannot take backups of a VM [{}] with VM snapshots.", vm);
@@ -760,8 +778,9 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         }
         final CommvaultClient client = getClient(vm.getDataCenterId());
         final String externalId = backup.getExternalId();
-        String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
-        final String path = externalId.substring(0, externalId.lastIndexOf(','));
+        final Pair<String, String> externalIdParts = parseExternalId(externalId);
+        final String path = externalIdParts.first();
+        final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails == null) {
             throw new CloudRuntimeException("Failed to get job details commvault api");
@@ -895,8 +914,9 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         final String externalId = backup.getExternalId();
         final Long zoneId = backup.getZoneId();
         final CommvaultClient client = getClient(zoneId);
-        String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
-        final String path = externalId.substring(0, externalId.lastIndexOf(','));
+        final Pair<String, String> externalIdParts = parseExternalId(externalId);
+        final String path = externalIdParts.first();
+        final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails == null) {
             throw new CloudRuntimeException("Failed to get job details commvault api");
@@ -1029,8 +1049,9 @@ public boolean deleteBackup(Backup backup, boolean forced) {
         }
         final Long zoneId = backup.getZoneId();
         final String externalId = backup.getExternalId();
-        String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
-        String path = externalId.substring(0, externalId.lastIndexOf(','));
+        final Pair<String, String> externalIdParts = parseExternalId(externalId);
+        final String path = externalIdParts.first();
+        final String jobId = externalIdParts.second();
         final CommvaultClient client = getClient(zoneId);
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails != null) {
@@ -1180,9 +1201,16 @@ public void syncBackups(VirtualMachine vm) {
         final CommvaultClient client = getClient(vm.getDataCenterId());
         for (final Backup backup: backupDao.listByVmId(vm.getDataCenterId(), vm.getId())) {
             loadBackupDetailsIfNeeded(backup);
-            String externalId = backup.getExternalId();
-            String jobId = externalId.substring(externalId.lastIndexOf(',') + 1).trim();
-            String path = externalId.substring(0, externalId.lastIndexOf(','));
+            final String externalId = backup.getExternalId();
+            final Pair<String, String> externalIdParts;
+            try {
+                externalIdParts = parseExternalId(externalId);
+            } catch (CloudRuntimeException e) {
+                LOG.warn("Skipping Commvault backup sync for backup [{}] due to invalid externalId [{}]", backup.getUuid(), externalId);
+                continue;
+            }
+            final String jobId = externalIdParts.second();
+            final String path = externalIdParts.first();
             String jobDetails = client.getJobDetails(jobId);
             if (jobDetails != null) {
                 JSONObject jsonObject = new JSONObject(jobDetails);

From adc6550596980eb2746fd9a9cc4cc0d826102ee1 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Thu, 9 Apr 2026 16:33:56 +0900
Subject: [PATCH 73/93] =?UTF-8?q?=EC=A6=9D=EB=B6=84=20=EB=B0=B1=EC=97=85?=
 =?UTF-8?q?=20=EB=AF=B8=EC=A0=81=EC=9A=A9=20=EC=98=A4=EB=A5=98=EB=A1=9C=20?=
 =?UTF-8?q?=EC=BD=98=ED=85=90=EC=B8=A0=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudstack/backup/CommvaultBackupProvider.java  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 96e355cce260..85ca73264313 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -304,19 +304,20 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
         }
 
         final String backupPath = buildBackupPath(vm);
+        final String backupContentPath = buildBackupContentPath(vm);
         List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
         vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
         Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
         validateVolumePoolTypes(volumePoolsAndPaths.first());
         final Backup latestBackup = getLatestBackedUpBackup(vm);
         final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup, vmHost);
-        BackupExecutionResult result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, backupPath, vmVolumes, volumePoolsAndPaths,
+        BackupExecutionResult result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, backupPath, backupContentPath, vmVolumes, volumePoolsAndPaths,
                 latestBackup, incrementalBackup, incrementalBackup && vmVolumes.size() > 1);
         if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
             cleanupFailedBackupForFullRetry(result.backup);
             LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
             String fallbackBackupPath = buildBackupPath(vm);
-            result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, fallbackBackupPath, vmVolumes, volumePoolsAndPaths,
+            result = executeBackup(vm, quiesceVM, vmHost, vmHostVO, client, planId, fallbackBackupPath, backupContentPath, vmVolumes, volumePoolsAndPaths,
                     null, false, false);
         }
         return new Pair<>(result.success, result.backup);
@@ -483,7 +484,7 @@ private void validateNoVmSnapshots(VirtualMachine vm) {
     }
 
     private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host vmHost, HostVO vmHostVO, CommvaultClient client,
-                                                String planId, String backupPath, List<VolumeVO> vmVolumes,
+                                                String planId, String backupPath, String backupContentPath, List<VolumeVO> vmVolumes,
                                                 Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths, Backup latestBackup,
                                                 boolean incrementalBackup, boolean retryAsFullOnFailure) {
         final String requestedBackupType = incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL;
@@ -547,7 +548,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
                 String subclientGUID = String.valueOf(jsonObject.get("subclientGUID"));
                 String subclientName = String.valueOf(jsonObject.get("subclientName"));
                 String csGUID = String.valueOf(jsonObject.get("csGUID"));
-                boolean upResult = client.updateBackupSet(backupPath, subclientId, clientId, planId, applicationId, backupsetId, instanceId, subclientName, backupsetName);
+                boolean upResult = client.updateBackupSet(backupContentPath, subclientId, clientId, planId, applicationId, backupsetId, instanceId, subclientName, backupsetName);
                 if (upResult) {
                     String planName = client.getPlanName(planId);
                     String storagePolicyId = client.getStoragePolicyId(planName);
@@ -666,6 +667,10 @@ private String buildBackupPath(VirtualMachine vm) {
                 new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS").format(new Date()));
     }
 
+    private String buildBackupContentPath(VirtualMachine vm) {
+        return String.format("%s/%s", COMMVAULT_DIRECTORY, vm.getInstanceName());
+    }
+
     private void validateVolumePoolTypes(List<PrimaryDataStoreTO> volumePools) {
         boolean hasRbd = volumePools.stream().anyMatch(pool -> pool.getPoolType() == Storage.StoragePoolType.RBD);
         boolean hasNonRbd = volumePools.stream().anyMatch(pool -> pool.getPoolType() != Storage.StoragePoolType.RBD);

From 8acfcb32075fc5c40f2b488be9d5ce95dee2b664 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 09:56:52 +0900
Subject: [PATCH 74/93] =?UTF-8?q?=EC=A4=91=EA=B0=84=20=EC=B2=B4=EC=9D=B8?=
 =?UTF-8?q?=20=EB=B3=B5=EC=9B=90=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../org/apache/cloudstack/backup/CommvaultBackupProvider.java    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 85ca73264313..e91b62f1e06c 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -727,6 +727,7 @@ private List<String> getBackupChain(Backup.VolumeInfo backupVolume, Backup backu
         List<String> chain = new ArrayList<>();
         Backup current = backup;
         while (current != null) {
+            loadBackupDetailsIfNeeded(current);
             Backup.VolumeInfo currentVolumeInfo = current.getBackedUpVolumes().stream()
                     .filter(volume -> Objects.equals(volume.getUuid(), backupVolume.getUuid()))
                     .findFirst()

From 5a6bbf0e7112e02a451e9ec10d29765d0420be65 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 10:43:04 +0900
Subject: [PATCH 75/93] =?UTF-8?q?=EC=A6=9D=EB=B6=84=EC=B2=B4=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B3=B5=EC=9B=90=EC=8B=9C=20=ED=8A=B9=EC=A0=95=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=EC=9D=B4=20=EC=95=84=EB=8B=8C=20=EA=B0=80=EC=83=81?=
 =?UTF-8?q?=EB=A8=B8=EC=8B=A0=20=EC=A0=84=EC=B2=B4=20=ED=8F=B4=EB=8D=94=20?=
 =?UTF-8?q?=EB=B3=B5=EC=9B=90=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/CommvaultBackupProvider.java       | 37 ++++++++++++++-----
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index e91b62f1e06c..1c3074f39e18 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -735,7 +735,7 @@ private List<String> getBackupChain(Backup.VolumeInfo backupVolume, Backup backu
             if (currentVolumeInfo == null) {
                 break;
             }
-            chain.add(0, currentVolumeInfo.getPath());
+            chain.add(0, getRestoreBackupFilePath(current, currentVolumeInfo));
             String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
             if (parentBackupUuid == null) {
                 break;
@@ -754,6 +754,23 @@ private void loadBackupDetailsIfNeeded(Backup backup) {
         }
     }
 
+    private String getRestoreBackupRootPath(Backup backup) {
+        final String backupPath = parseExternalId(backup.getExternalId()).first();
+        if (BACKUP_ENGINE_RBD_DIFF.equals(getBackupDetail(backup, DETAIL_BACKUP_ENGINE))) {
+            return java.nio.file.Path.of(backupPath).getParent().toString();
+        }
+        return backupPath;
+    }
+
+    private String getRestoreBackupFilePath(Backup backup, Backup.VolumeInfo volumeInfo) {
+        final String backupPath = parseExternalId(backup.getExternalId()).first();
+        final String filePath = volumeInfo.getPath();
+        if (BACKUP_ENGINE_RBD_DIFF.equals(getBackupDetail(backup, DETAIL_BACKUP_ENGINE))) {
+            return java.nio.file.Path.of(backupPath).getFileName().resolve(filePath).toString();
+        }
+        return filePath;
+    }
+
     private boolean isLegacyBackup(Backup backup) {
         return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
     }
@@ -786,6 +803,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         final String externalId = backup.getExternalId();
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
+        final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails == null) {
@@ -815,7 +833,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         final HostVO restoreHostVO = hostDao.findById(restoreHost.getId());
         LOG.info(String.format("Restoring vm %s from backup %s on the Commvault Backup Provider", vm, backup));
         // 복원 실행
-        String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, path);
+        String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
         if (jobId2 != null) {
             String jobStatus = client.getJobStatus(jobId2);
             if (jobStatus.equalsIgnoreCase("Completed")) {
@@ -830,8 +848,8 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
 
                 LOG.debug("Restoring vm {} from backup {} on the Commvault Backup Provider", vm, backup);
                 CommvaultRestoreBackupCommand restoreCommand = new CommvaultRestoreBackupCommand();
-                LOG.info(path);
-                restoreCommand.setBackupPath(path);
+                LOG.info(restoreSourcePath);
+                restoreCommand.setBackupPath(restoreSourcePath);
                 restoreCommand.setVmName(vm.getName());
                 restoreCommand.setBackupVolumesUUIDs(backedVolumesUUIDs);
                 if (isLegacyBackup(backup)) {
@@ -842,7 +860,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                 } else {
                     restoreCommand.setBackupFiles(backup.getBackedUpVolumes().stream()
                             .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
-                            .map(Backup.VolumeInfo::getPath)
+                            .map(volume -> getRestoreBackupFilePath(backup, volume))
                             .collect(Collectors.toList()));
                     restoreCommand.setBackupFileChains(getBackupFileChains(backup.getBackedUpVolumes(), backup));
                 }
@@ -865,7 +883,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                 if (!answer.getResult()) {
                     int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
                     Ternary<String, String, String> credentials = getKVMHyperisorCredentials(restoreHostVO);
-                    String command = String.format(RM_COMMAND, path);
+                    String command = String.format(RM_COMMAND, restoreSourcePath);
                     executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
                 }
                 return new Pair<>(answer.getResult(), answer.getDetails());
@@ -922,6 +940,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         final CommvaultClient client = getClient(zoneId);
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
+        final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails == null) {
@@ -947,7 +966,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
             throw new CloudRuntimeException("Failed to get vm backup set guid commvault api");
         }
         // 복원 실행
-        String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, path);
+        String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
         if (jobId2 != null) {
             String jobStatus = client.getJobStatus(jobId2);
             if (jobStatus.equalsIgnoreCase("Completed")) {
@@ -993,9 +1012,9 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 }
 
                 CommvaultRestoreBackupCommand restoreCommand = new CommvaultRestoreBackupCommand();
-                restoreCommand.setBackupPath(path);
+                restoreCommand.setBackupPath(restoreSourcePath);
                 restoreCommand.setVmName(vmNameAndState.first());
-                restoreCommand.setBackupFiles(Collections.singletonList(isLegacyBackup(backup) ? getLegacyBackupFileName(backupVolumeInfo) : backupVolumeInfo.getPath()));
+                restoreCommand.setBackupFiles(Collections.singletonList(isLegacyBackup(backup) ? getLegacyBackupFileName(backupVolumeInfo) : getRestoreBackupFilePath(backup, backupVolumeInfo)));
                 if (!isLegacyBackup(backup)) {
                     restoreCommand.setBackupFileChains(Collections.singletonList(getBackupFileChain(backupVolumeInfo, backup)));
                 }

From 482c8b4becacd635fbfb06eabc04f38b3087a6db Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 10:55:44 +0900
Subject: [PATCH 76/93] =?UTF-8?q?=EC=B2=B4=EC=9D=B8=EC=9D=B4=20=EB=8B=A4?=
 =?UTF-8?q?=EB=A5=B8=20=ED=98=B8=EC=8A=A4=ED=8A=B8=EC=97=90=20=ED=9D=A9?=
 =?UTF-8?q?=EC=96=B4=EC=A7=84=20=EA=B2=BD=EC=9A=B0=20=EB=AA=A8=EC=95=84?=
 =?UTF-8?q?=EC=84=9C=20=EB=B3=B5=EC=9B=90=20=ED=98=B8=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/CommvaultRestoreBackupCommand.java |   9 ++
 .../backup/CommvaultBackupProvider.java       | 144 +++++++++++++++---
 ...tCommvaultRestoreBackupCommandWrapper.java |  11 ++
 3 files changed, 147 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
index 173383053958..31e60c32eaba 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
@@ -41,6 +41,7 @@ public class CommvaultRestoreBackupCommand extends Command  {
     private Integer timeout;
     private String cacheMode;
     private String hostName;
+    private List<String> backupSourceHosts;
 
     protected CommvaultRestoreBackupCommand() {
         super();
@@ -165,4 +166,12 @@ public String getHostName() {
     public void setHostName(String hostName) {
         this.hostName = hostName;
     }
+
+    public List<String> getBackupSourceHosts() {
+        return backupSourceHosts;
+    }
+
+    public void setBackupSourceHosts(List<String> backupSourceHosts) {
+        this.backupSourceHosts = backupSourceHosts;
+    }
 }
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
index 1c3074f39e18..7ef8b6a6d1d6 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
@@ -78,6 +78,7 @@
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -748,6 +749,24 @@ private List<String> getBackupChain(Backup.VolumeInfo backupVolume, Backup backu
         return chain;
     }
 
+    private LinkedHashMap<String, Backup> getBackupChainStageHosts(Backup backup) {
+        LinkedHashMap<String, Backup> stageHosts = new LinkedHashMap<>();
+        Backup current = backup;
+        while (current != null) {
+            loadBackupDetailsIfNeeded(current);
+            String stageHost = getBackupDetail(current, DETAIL_STAGE_HOST);
+            if (StringUtils.isNotBlank(stageHost)) {
+                stageHosts.putIfAbsent(stageHost, current);
+            }
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            if (parentBackupUuid == null) {
+                break;
+            }
+            current = backupDao.findByUuid(parentBackupUuid);
+        }
+        return stageHosts;
+    }
+
     private void loadBackupDetailsIfNeeded(Backup backup) {
         if (backup instanceof BackupVO && backup.getDetails() == null) {
             backupDao.loadDetails((BackupVO) backup);
@@ -775,6 +794,87 @@ private boolean isLegacyBackup(Backup backup) {
         return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
     }
 
+    private List<String> restoreBackupSourcesOnAdditionalHosts(CommvaultClient client, Backup backup, String executionHostName) {
+        if (!BACKUP_ENGINE_RBD_DIFF.equals(getBackupDetail(backup, DETAIL_BACKUP_ENGINE))) {
+            return Collections.emptyList();
+        }
+
+        List<String> additionalHosts = new ArrayList<>();
+        for (Map.Entry<String, Backup> entry : getBackupChainStageHosts(backup).entrySet()) {
+            String stageHost = entry.getKey();
+            if (StringUtils.isBlank(stageHost) || Objects.equals(stageHost, executionHostName)) {
+                continue;
+            }
+            restoreBackupRootOnStageHost(client, entry.getValue());
+            additionalHosts.add(stageHost);
+        }
+        return additionalHosts;
+    }
+
+    private void restoreBackupRootOnStageHost(CommvaultClient client, Backup backup) {
+        final Pair<String, String> externalIdParts = parseExternalId(backup.getExternalId());
+        final String restoreSourcePath = getRestoreBackupRootPath(backup);
+        final String jobId = externalIdParts.second();
+        String jobDetails = client.getJobDetails(jobId);
+        if (jobDetails == null) {
+            throw new CloudRuntimeException("Failed to get job details commvault api");
+        }
+
+        JSONObject jsonObject = new JSONObject(jobDetails);
+        String endTime = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("detailInfo").get("endTime"));
+        String subclientId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("subclientId"));
+        String displayName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("displayName"));
+        String clientId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("clientId"));
+        String companyId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("company").get("companyId"));
+        String companyName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("company").get("companyName"));
+        String instanceName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("instanceName"));
+        String appName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("appName"));
+        String applicationId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("applicationId"));
+        String clientName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("clientName"));
+        String backupsetId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("backupsetId"));
+        String instanceId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("instanceId"));
+        String backupsetName = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("subclient").get("backupsetName"));
+        String commCellId = String.valueOf(jsonObject.getJSONObject("job").getJSONObject("jobDetail").getJSONObject("generalInfo").getJSONObject("commcell").get("commCellId"));
+        String backupsetGUID = client.getVmBackupSetGuid(clientName, backupsetName);
+        if (backupsetGUID == null) {
+            throw new CloudRuntimeException("Failed to get vm backup set guid commvault api");
+        }
+
+        String restoreJobId = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName,
+                appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
+        if (restoreJobId == null) {
+            throw new CloudRuntimeException("Failed to restore Full VM commvault api");
+        }
+
+        String jobStatus = client.getJobStatus(restoreJobId);
+        if (!jobStatus.equalsIgnoreCase("Completed")) {
+            throw new CloudRuntimeException("Failed to restore Full VM commvault api resulted in " + jobStatus);
+        }
+    }
+
+    private void cleanupBackupPathOnAdditionalHosts(List<String> hostNames, String backupPath) {
+        if (hostNames == null || hostNames.isEmpty()) {
+            return;
+        }
+        int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
+        String command = String.format(RM_COMMAND, backupPath);
+        for (String hostName : hostNames) {
+            if (StringUtils.isBlank(hostName)) {
+                continue;
+            }
+            HostVO host = hostDao.findByName(hostName);
+            if (host == null) {
+                continue;
+            }
+            try {
+                Ternary<String, String, String> credentials = getKVMHyperisorCredentials(host);
+                executeDeleteBackupPathCommand(host, credentials.first(), credentials.second(), sshPort, command);
+            } catch (Exception e) {
+                LOG.warn("Failed to cleanup Commvault restore source path [{}] on host [{}]", backupPath, hostName, e);
+            }
+        }
+    }
+
     private String getLegacyBackupFileName(Backup.VolumeInfo backupVolumeInfo) {
         String diskType = Volume.Type.ROOT.equals(backupVolumeInfo.getType()) ? "root" : "datadisk";
         return String.format("%s.%s.qcow2", diskType, backupVolumeInfo.getUuid());
@@ -831,12 +931,13 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         // 복원된 호스트 정의
         final HostVO restoreHost = hostDao.findByName(clientName);
         final HostVO restoreHostVO = hostDao.findById(restoreHost.getId());
+        final List<String> additionalSourceHosts = restoreBackupSourcesOnAdditionalHosts(client, backup, clientName);
         LOG.info(String.format("Restoring vm %s from backup %s on the Commvault Backup Provider", vm, backup));
-        // 복원 실행
-        String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
-        if (jobId2 != null) {
-            String jobStatus = client.getJobStatus(jobId2);
-            if (jobStatus.equalsIgnoreCase("Completed")) {
+        try {
+            String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
+            if (jobId2 != null) {
+                String jobStatus = client.getJobStatus(jobId2);
+                if (jobStatus.equalsIgnoreCase("Completed")) {
                 List<String> backedVolumesUUIDs = backup.getBackedUpVolumes().stream()
                         .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
                         .map(Backup.VolumeInfo::getUuid)
@@ -871,6 +972,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                 restoreCommand.setVmState(vm.getState());
                 restoreCommand.setTimeout(CommvaultBackupRestoreTimeout.value());
                 restoreCommand.setHostName(null);
+                restoreCommand.setBackupSourceHosts(additionalSourceHosts);
 
                 BackupAnswer answer;
                 try {
@@ -887,11 +989,14 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                     executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
                 }
                 return new Pair<>(answer.getResult(), answer.getDetails());
+                } else {
+                    throw new CloudRuntimeException("Failed to restore Full VM commvault api resulted in " + jobStatus);
+                }
             } else {
-                throw new CloudRuntimeException("Failed to restore Full VM commvault api resulted in " + jobStatus);
+                throw new CloudRuntimeException("Failed to restore Full VM commvault api");
             }
-        } else {
-            throw new CloudRuntimeException("Failed to restore Full VM commvault api");
+        } finally {
+            cleanupBackupPathOnAdditionalHosts(additionalSourceHosts, restoreSourcePath);
         }
     }
 
@@ -965,11 +1070,12 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         if (backupsetGUID == null) {
             throw new CloudRuntimeException("Failed to get vm backup set guid commvault api");
         }
-        // 복원 실행
-        String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
-        if (jobId2 != null) {
-            String jobStatus = client.getJobStatus(jobId2);
-            if (jobStatus.equalsIgnoreCase("Completed")) {
+        final List<String> additionalSourceHosts = restoreBackupSourcesOnAdditionalHosts(client, backup, clientName);
+        try {
+            String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
+            if (jobId2 != null) {
+                String jobStatus = client.getJobStatus(jobId2);
+                if (jobStatus.equalsIgnoreCase("Completed")) {
                 final VolumeVO volume = volumeDao.findByUuid(backupVolumeInfo.getUuid());
                 final DiskOffering diskOffering = diskOfferingDao.findByUuid(backupVolumeInfo.getDiskOfferingId());
                 String cacheMode = null;
@@ -1028,6 +1134,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 restoreCommand.setTimeout(CommvaultBackupRestoreTimeout.value());
                 restoreCommand.setCacheMode(cacheMode);
                 restoreCommand.setHostName(null);
+                restoreCommand.setBackupSourceHosts(additionalSourceHosts);
 
                 BackupAnswer answer;
                 try {
@@ -1048,14 +1155,17 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 } else {
                     final int sshPort = NumbersUtil.parseInt(configDao.getValue("kvm.ssh.port"), 22);
                     Ternary<String, String, String> credentials = getKVMHyperisorCredentials(restoreHostVO);
-                    String command = String.format(RM_COMMAND, path);
+                    String command = String.format(RM_COMMAND, restoreSourcePath);
                     executeDeleteBackupPathCommand(restoreHostVO, credentials.first(), credentials.second(), sshPort, command);
                 }
+                } else {
+                    LOG.error("Failed to restore backup for VM " + vmNameAndState.first() + " to restore backup job status is " + jobStatus);
+                }
             } else {
-                LOG.error("Failed to restore backup for VM " + vmNameAndState.first() + " to restore backup job status is " + jobStatus);
+                LOG.error("Failed to restore backup for VM " + vmNameAndState.first() + " to restore backup job commvault api");
             }
-        } else {
-            LOG.error("Failed to restore backup for VM " + vmNameAndState.first() + " to restore backup job commvault api");
+        } finally {
+            cleanupBackupPathOnAdditionalHosts(additionalSourceHosts, restoreSourcePath);
         }
         return new Pair<>(false, null);
     }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
index 0e944be823cc..1708a2440857 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
@@ -47,6 +47,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -76,6 +77,7 @@ public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingRes
         int timeout = command.getTimeout();
         String cacheMode = command.getCacheMode();
         String hostName = command.getHostName();
+        List<String> backupSourceHosts = command.getBackupSourceHosts();
         KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
 
         String newVolumeId = null;
@@ -83,6 +85,15 @@ public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingRes
             if (hostName != null) {
                 fetchBackupFile(hostName, backupPath);
             }
+            if (backupSourceHosts != null && !backupSourceHosts.isEmpty()) {
+                LinkedHashSet<String> sourceHosts = new LinkedHashSet<>(backupSourceHosts);
+                for (String sourceHost : sourceHosts) {
+                    if (StringUtils.isBlank(sourceHost) || Objects.equals(sourceHost, hostName)) {
+                        continue;
+                    }
+                    fetchBackupFile(sourceHost, backupPath);
+                }
+            }
             if (Objects.isNull(vmExists)) {
                 PrimaryDataStoreTO volumePool = restoreVolumePools.get(0);
                 String volumePath = restoreVolumePaths.get(0);

From c8cb8b9b6286a926a7ecf5b951d566e83935b357 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 11:28:21 +0900
Subject: [PATCH 77/93] =?UTF-8?q?=EB=B3=B5=EC=9B=90=EC=8B=9C=20=ED=8C=8C?=
 =?UTF-8?q?=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apache/cloudstack/backup/commvault/CommvaultClient.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
index cafe984a12fa..fd3ca5c50b7d 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
+++ b/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
@@ -1386,9 +1386,9 @@ public String restoreFullVM(String subclientId, String displayName, String backu
                                 + "},"
                                 + "\"commonOptions\":{"
                                     + "\"overwriteFiles\":true,"
-                                    + "\"unconditionalOverwrite\":false,"
+                                    + "\"unconditionalOverwrite\":true,"
                                     + "\"stripLevelType\":\"PRESERVE_LEVEL\","
-                                    + "\"preserveLevel\":1,"
+                                    + "\"preserveLevel\":0,"
                                     + "\"isFromBrowseBackup\":true"
                                 + "}"
                             + "}"

From 84153ce03b503b13dd73ab8d8f4b692e5dd5bdc0 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 14:46:20 +0900
Subject: [PATCH 78/93] =?UTF-8?q?=ED=81=B4=EB=9E=98=EC=8A=A4=20=EB=B6=84?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...lestackCommvaultRestoreBackupCommand.java} |    0
 ... AblestackCommvaultTakeBackupCommand.java} |    4 +-
 .../backup/AblestackDeleteBackupCommand.java  |  113 ++
 .../AblestackNasRestoreBackupCommand.java     |  185 +++
 .../backup/AblestackNasTakeBackupCommand.java |  167 +++
 .../backup/DeleteBackupCommand.java           |   39 +-
 .../backup/RestoreBackupCommand.java          |    9 -
 .../cloudstack/backup/TakeBackupCommand.java  |   54 -
 .../pom.xml                                   |    2 +-
 .../AblestackCommvaultBackupProvider.java}    |   46 +-
 .../AblestackCommvaultBackupOffering.java}    |    6 +-
 .../commvault/AblestackCommvaultClient.java}  |    6 +-
 .../commvault/AblestackCommvaultObject.java}  |    4 +-
 .../cloudstack/commvault/module.properties    |    0
 .../spring-backup-commvault-context.xml       |    4 +-
 plugins/backup/ablestack-nas/pom.xml          |   54 +
 .../backup/AblestackNasBackupOffering.java    |   80 ++
 .../backup/AblestackNasBackupProvider.java    | 1037 +++++++++++++++++
 .../META-INF/cloudstack/nas/module.properties |   18 +
 .../nas/spring-backup-nas-context.xml         |   26 +
 .../AblestackNasBackupProviderTest.java       |  357 ++++++
 .../cloudstack/backup/NASBackupProvider.java  |  449 +------
 .../backup/NASBackupProviderTest.java         |    3 +-
 .../resource/LibvirtComputingResource.java    |   22 +-
 ...ibvirtAblestackCommvaultBackupHelper.java} |   26 +-
 ...CommvaultRestoreBackupCommandWrapper.java} |    8 +-
 ...ackCommvaultTakeBackupCommandWrapper.java} |   10 +-
 ...rtAblestackDeleteBackupCommandWrapper.java |  103 ++
 ...a => LibvirtAblestackNasBackupHelper.java} |   26 +-
 ...lestackNasRestoreBackupCommandWrapper.java |  835 +++++++++++++
 ...tAblestackNasTakeBackupCommandWrapper.java |   61 +
 .../LibvirtDeleteBackupCommandWrapper.java    |   56 +-
 .../LibvirtRestoreBackupCommandWrapper.java   |  596 +---------
 .../LibvirtTakeBackupCommandWrapper.java      |   74 +-
 .../{cvtbackup.sh => ablestack_cvtbackup.sh}  |   25 +-
 .../vm/hypervisor/kvm/ablestack_nasbackup.sh  |  626 ++++++++++
 scripts/vm/hypervisor/kvm/nasbackup.sh        |  418 +------
 37 files changed, 3993 insertions(+), 1556 deletions(-)
 rename core/src/main/java/org/apache/cloudstack/backup/{CommvaultRestoreBackupCommand.java => AblestackCommvaultRestoreBackupCommand.java} (100%)
 rename core/src/main/java/org/apache/cloudstack/backup/{CommvaultTakeBackupCommand.java => AblestackCommvaultTakeBackupCommand.java} (95%)
 create mode 100644 core/src/main/java/org/apache/cloudstack/backup/AblestackDeleteBackupCommand.java
 create mode 100644 core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java
 create mode 100644 core/src/main/java/org/apache/cloudstack/backup/AblestackNasTakeBackupCommand.java
 rename plugins/backup/{commvault => ablestack-commvault}/pom.xml (96%)
 rename plugins/backup/{commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java => ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java} (97%)
 rename plugins/backup/{commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultBackupOffering.java => ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultBackupOffering.java} (90%)
 rename plugins/backup/{commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java => ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java} (99%)
 rename plugins/backup/{commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultObject.java => ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultObject.java} (91%)
 rename plugins/backup/{commvault => ablestack-commvault}/src/main/resources/META-INF/cloudstack/commvault/module.properties (100%)
 rename plugins/backup/{commvault => ablestack-commvault}/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml (85%)
 create mode 100644 plugins/backup/ablestack-nas/pom.xml
 create mode 100644 plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java
 create mode 100644 plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
 create mode 100644 plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties
 create mode 100644 plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml
 create mode 100644 plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java
 rename plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtCommvaultBackupHelper.java => LibvirtAblestackCommvaultBackupHelper.java} (92%)
 rename plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtCommvaultRestoreBackupCommandWrapper.java => LibvirtAblestackCommvaultRestoreBackupCommandWrapper.java} (99%)
 rename plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtCommvaultTakeBackupCommandWrapper.java => LibvirtAblestackCommvaultTakeBackupCommandWrapper.java} (75%)
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
 rename plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtNasBackupHelper.java => LibvirtAblestackNasBackupHelper.java} (94%)
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasRestoreBackupCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java
 rename scripts/vm/hypervisor/kvm/{cvtbackup.sh => ablestack_cvtbackup.sh} (91%)
 create mode 100755 scripts/vm/hypervisor/kvm/ablestack_nasbackup.sh

diff --git a/core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java
similarity index 100%
rename from core/src/main/java/org/apache/cloudstack/backup/CommvaultRestoreBackupCommand.java
rename to core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java
diff --git a/core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultTakeBackupCommand.java
similarity index 95%
rename from core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java
rename to core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultTakeBackupCommand.java
index 28b24db046be..5c22a8d8cfc7 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/CommvaultTakeBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultTakeBackupCommand.java
@@ -24,7 +24,7 @@
 
 import java.util.List;
 
-public class CommvaultTakeBackupCommand extends Command {
+public class AblestackCommvaultTakeBackupCommand extends Command {
     private String vmName;
     private String backupPath;
     private List<PrimaryDataStoreTO> volumePools;
@@ -37,7 +37,7 @@ public class CommvaultTakeBackupCommand extends Command {
     private String parentCheckpointPath;
     private List<String> backupFiles;
 
-    public CommvaultTakeBackupCommand(String vmName, String backupPath) {
+    public AblestackCommvaultTakeBackupCommand(String vmName, String backupPath) {
         super();
         this.vmName = vmName;
         this.backupPath = backupPath;
diff --git a/core/src/main/java/org/apache/cloudstack/backup/AblestackDeleteBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackDeleteBackupCommand.java
new file mode 100644
index 000000000000..7d892b22a12c
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/backup/AblestackDeleteBackupCommand.java
@@ -0,0 +1,113 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.LogLevel;
+
+public class AblestackDeleteBackupCommand extends Command {
+    private String backupPath;
+    private String backupRepoType;
+    private String backupRepoAddress;
+    private String backupProvider;
+    private String checkpointName;
+    private String diskPaths;
+    private boolean forced;
+    @LogLevel(LogLevel.Log4jLevel.Off)
+    private String mountOptions;
+
+    public AblestackDeleteBackupCommand(String backupPath, String backupRepoType, String backupRepoAddress, String mountOptions, boolean forced) {
+        super();
+        this.backupPath = backupPath;
+        this.backupRepoType = backupRepoType;
+        this.backupRepoAddress = backupRepoAddress;
+        this.mountOptions = mountOptions;
+        this.forced = forced;
+    }
+
+    public String getBackupPath() {
+        return backupPath;
+    }
+
+    public void setBackupPath(String backupPath) {
+        this.backupPath = backupPath;
+    }
+
+    public String getBackupRepoType() {
+        return backupRepoType;
+    }
+
+    public void setBackupRepoType(String backupRepoType) {
+        this.backupRepoType = backupRepoType;
+    }
+
+    public String getBackupRepoAddress() {
+        return backupRepoAddress;
+    }
+
+    public void setBackupRepoAddress(String backupRepoAddress) {
+        this.backupRepoAddress = backupRepoAddress;
+    }
+
+    public String getBackupProvider() {
+        return backupProvider;
+    }
+
+    public void setBackupProvider(String backupProvider) {
+        this.backupProvider = backupProvider;
+    }
+
+    public String getCheckpointName() {
+        return checkpointName;
+    }
+
+    public void setCheckpointName(String checkpointName) {
+        this.checkpointName = checkpointName;
+    }
+
+    public String getDiskPaths() {
+        return diskPaths;
+    }
+
+    public void setDiskPaths(String diskPaths) {
+        this.diskPaths = diskPaths;
+    }
+
+    public String getMountOptions() {
+        return mountOptions == null ? "" : mountOptions;
+    }
+
+    public void setMountOptions(String mountOptions) {
+        this.mountOptions = mountOptions;
+    }
+
+    public boolean isForced() {
+        return forced;
+    }
+
+    public void setForced(boolean forced) {
+        this.forced = forced;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+}
diff --git a/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java
new file mode 100644
index 000000000000..85ddd3cd3118
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java
@@ -0,0 +1,185 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.LogLevel;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
+import java.util.List;
+
+public class RestoreBackupCommand extends Command  {
+    private String vmName;
+    private String backupPath;
+    private String backupRepoType;
+    private String backupRepoAddress;
+    private List<String> backupVolumesUUIDs;
+    private List<PrimaryDataStoreTO> restoreVolumePools;
+    private List<String> restoreVolumePaths;
+    private List<String> volumePaths;
+    private List<String> backupFiles;
+    private List<String> backupFileChains;
+    private String diskType;
+    private Boolean vmExists;
+    private VirtualMachine.State vmState;
+    private Integer mountTimeout;
+    private String cacheMode;
+
+    protected RestoreBackupCommand() {
+        super();
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public String getBackupPath() {
+        return backupPath;
+    }
+
+    public void setBackupPath(String backupPath) {
+        this.backupPath = backupPath;
+    }
+
+    public String getBackupRepoType() {
+        return backupRepoType;
+    }
+
+    public void setBackupRepoType(String backupRepoType) {
+        this.backupRepoType = backupRepoType;
+    }
+
+    public String getBackupRepoAddress() {
+        return backupRepoAddress;
+    }
+
+    public void setBackupRepoAddress(String backupRepoAddress) {
+        this.backupRepoAddress = backupRepoAddress;
+    }
+
+    public List<PrimaryDataStoreTO> getRestoreVolumePools() {
+        return restoreVolumePools;
+    }
+
+    public void setRestoreVolumePools(List<PrimaryDataStoreTO> restoreVolumePools) {
+        this.restoreVolumePools = restoreVolumePools;
+    }
+
+    public List<String> getRestoreVolumePaths() {
+        return restoreVolumePaths;
+    }
+
+    public void setRestoreVolumePaths(List<String> restoreVolumePaths) {
+        this.restoreVolumePaths = restoreVolumePaths;
+    }
+
+    public List<String> getVolumePaths() {
+        return volumePaths;
+    }
+
+    public void setVolumePaths(List<String> volumePaths) {
+        this.volumePaths = volumePaths;
+    }
+
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
+    public List<String> getBackupFileChains() {
+        return backupFileChains;
+    }
+
+    public void setBackupFileChains(List<String> backupFileChains) {
+        this.backupFileChains = backupFileChains;
+    }
+
+    public Boolean isVmExists() {
+        return vmExists;
+    }
+
+    public void setVmExists(Boolean vmExists) {
+        this.vmExists = vmExists;
+    }
+
+    public String getDiskType() {
+        return diskType;
+    }
+
+    public void setDiskType(String diskType) {
+        this.diskType = diskType;
+    }
+
+    public String getMountOptions() {
+        return mountOptions;
+    }
+
+    public void setMountOptions(String mountOptions) {
+        this.mountOptions = mountOptions;
+    }
+
+    public VirtualMachine.State getVmState() {
+        return vmState;
+    }
+
+    public void setVmState(VirtualMachine.State vmState) {
+        this.vmState = vmState;
+    }
+
+    @LogLevel(LogLevel.Log4jLevel.Off)
+    private String mountOptions;
+    @Override
+
+    public boolean executeInSequence() {
+        return true;
+    }
+
+    public List<String> getBackupVolumesUUIDs() {
+        return backupVolumesUUIDs;
+    }
+
+    public void setBackupVolumesUUIDs(List<String> backupVolumesUUIDs) {
+        this.backupVolumesUUIDs = backupVolumesUUIDs;
+    }
+
+    public Integer getMountTimeout() {
+        return this.mountTimeout == null ? 0 : this.mountTimeout;
+    }
+
+    public void setMountTimeout(Integer mountTimeout) {
+        this.mountTimeout = mountTimeout;
+    }
+
+    public String getCacheMode() {
+        return cacheMode;
+    }
+
+    public void setCacheMode(String cacheMode) {
+        this.cacheMode = cacheMode;
+    }
+}
diff --git a/core/src/main/java/org/apache/cloudstack/backup/AblestackNasTakeBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackNasTakeBackupCommand.java
new file mode 100644
index 000000000000..56b132176913
--- /dev/null
+++ b/core/src/main/java/org/apache/cloudstack/backup/AblestackNasTakeBackupCommand.java
@@ -0,0 +1,167 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.api.Command;
+import com.cloud.agent.api.LogLevel;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+
+import java.util.List;
+
+public class AblestackNasTakeBackupCommand extends Command {
+    private String vmName;
+    private String backupPath;
+    private String backupType;
+    private String checkpointName;
+    private String parentBackupPath;
+    private String parentCheckpointName;
+    private String parentCheckpointPath;
+    private String backupRepoType;
+    private String backupRepoAddress;
+    private List<PrimaryDataStoreTO> volumePools;
+    private List<String> volumePaths;
+    private List<String> backupFiles;
+    private Boolean quiesce;
+    @LogLevel(LogLevel.Log4jLevel.Off)
+    private String mountOptions;
+
+    public AblestackNasTakeBackupCommand(String vmName, String backupPath) {
+        super();
+        this.vmName = vmName;
+        this.backupPath = backupPath;
+    }
+
+    public String getVmName() {
+        return vmName;
+    }
+
+    public void setVmName(String vmName) {
+        this.vmName = vmName;
+    }
+
+    public String getBackupPath() {
+        return backupPath;
+    }
+
+    public void setBackupPath(String backupPath) {
+        this.backupPath = backupPath;
+    }
+
+    public String getBackupType() {
+        return backupType;
+    }
+
+    public void setBackupType(String backupType) {
+        this.backupType = backupType;
+    }
+
+    public String getCheckpointName() {
+        return checkpointName;
+    }
+
+    public void setCheckpointName(String checkpointName) {
+        this.checkpointName = checkpointName;
+    }
+
+    public String getParentBackupPath() {
+        return parentBackupPath;
+    }
+
+    public void setParentBackupPath(String parentBackupPath) {
+        this.parentBackupPath = parentBackupPath;
+    }
+
+    public String getParentCheckpointName() {
+        return parentCheckpointName;
+    }
+
+    public void setParentCheckpointName(String parentCheckpointName) {
+        this.parentCheckpointName = parentCheckpointName;
+    }
+
+    public String getParentCheckpointPath() {
+        return parentCheckpointPath;
+    }
+
+    public void setParentCheckpointPath(String parentCheckpointPath) {
+        this.parentCheckpointPath = parentCheckpointPath;
+    }
+
+    public String getBackupRepoType() {
+        return backupRepoType;
+    }
+
+    public void setBackupRepoType(String backupRepoType) {
+        this.backupRepoType = backupRepoType;
+    }
+
+    public String getBackupRepoAddress() {
+        return backupRepoAddress;
+    }
+
+    public void setBackupRepoAddress(String backupRepoAddress) {
+        this.backupRepoAddress = backupRepoAddress;
+    }
+
+    public String getMountOptions() {
+        return mountOptions;
+    }
+
+    public void setMountOptions(String mountOptions) {
+        this.mountOptions = mountOptions;
+    }
+
+    public List<PrimaryDataStoreTO> getVolumePools() {
+        return volumePools;
+    }
+
+    public void setVolumePools(List<PrimaryDataStoreTO> volumePools) {
+        this.volumePools = volumePools;
+    }
+
+    public List<String> getVolumePaths() {
+        return volumePaths;
+    }
+
+    public void setVolumePaths(List<String> volumePaths) {
+        this.volumePaths = volumePaths;
+    }
+
+    public List<String> getBackupFiles() {
+        return backupFiles;
+    }
+
+    public void setBackupFiles(List<String> backupFiles) {
+        this.backupFiles = backupFiles;
+    }
+
+    public Boolean getQuiesce() {
+        return quiesce;
+    }
+
+    public void setQuiesce(Boolean quiesce) {
+        this.quiesce = quiesce;
+    }
+
+    @Override
+    public boolean executeInSequence() {
+        return true;
+    }
+}
diff --git a/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
index 7221bfc363bd..16c611af998e 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/DeleteBackupCommand.java
@@ -26,20 +26,15 @@ public class DeleteBackupCommand extends Command {
     private String backupPath;
     private String backupRepoType;
     private String backupRepoAddress;
-    private String backupProvider;
-    private String checkpointName;
-    private String diskPaths;
-    private boolean forced;
     @LogLevel(LogLevel.Log4jLevel.Off)
     private String mountOptions;
 
-    public DeleteBackupCommand(String backupPath, String backupRepoType, String backupRepoAddress, String mountOptions, boolean forced) {
+    public DeleteBackupCommand(String backupPath, String backupRepoType, String backupRepoAddress, String mountOptions) {
         super();
         this.backupPath = backupPath;
         this.backupRepoType = backupRepoType;
         this.backupRepoAddress = backupRepoAddress;
         this.mountOptions = mountOptions;
-        this.forced = forced;
     }
 
     public String getBackupPath() {
@@ -66,30 +61,6 @@ public void setBackupRepoAddress(String backupRepoAddress) {
         this.backupRepoAddress = backupRepoAddress;
     }
 
-    public String getBackupProvider() {
-        return backupProvider;
-    }
-
-    public void setBackupProvider(String backupProvider) {
-        this.backupProvider = backupProvider;
-    }
-
-    public String getCheckpointName() {
-        return checkpointName;
-    }
-
-    public void setCheckpointName(String checkpointName) {
-        this.checkpointName = checkpointName;
-    }
-
-    public String getDiskPaths() {
-        return diskPaths;
-    }
-
-    public void setDiskPaths(String diskPaths) {
-        this.diskPaths = diskPaths;
-    }
-
     public String getMountOptions() {
         return mountOptions == null ? "" : mountOptions;
     }
@@ -98,14 +69,6 @@ public void setMountOptions(String mountOptions) {
         this.mountOptions = mountOptions;
     }
 
-    public boolean isForced() {
-        return forced;
-    }
-
-    public void setForced(boolean forced) {
-        this.forced = forced;
-    }
-
     @Override
     public boolean executeInSequence() {
         return true;
diff --git a/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
index 85ddd3cd3118..c1d08ba71d8c 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/RestoreBackupCommand.java
@@ -36,7 +36,6 @@ public class RestoreBackupCommand extends Command  {
     private List<String> restoreVolumePaths;
     private List<String> volumePaths;
     private List<String> backupFiles;
-    private List<String> backupFileChains;
     private String diskType;
     private Boolean vmExists;
     private VirtualMachine.State vmState;
@@ -111,14 +110,6 @@ public void setBackupFiles(List<String> backupFiles) {
         this.backupFiles = backupFiles;
     }
 
-    public List<String> getBackupFileChains() {
-        return backupFileChains;
-    }
-
-    public void setBackupFileChains(List<String> backupFileChains) {
-        this.backupFileChains = backupFileChains;
-    }
-
     public Boolean isVmExists() {
         return vmExists;
     }
diff --git a/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
index 20c26ce959ec..5402b6b24760 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/TakeBackupCommand.java
@@ -28,16 +28,10 @@
 public class TakeBackupCommand extends Command {
     private String vmName;
     private String backupPath;
-    private String backupType;
-    private String checkpointName;
-    private String parentBackupPath;
-    private String parentCheckpointName;
-    private String parentCheckpointPath;
     private String backupRepoType;
     private String backupRepoAddress;
     private List<PrimaryDataStoreTO> volumePools;
     private List<String> volumePaths;
-    private List<String> backupFiles;
     private Boolean quiesce;
     @LogLevel(LogLevel.Log4jLevel.Off)
     private String mountOptions;
@@ -64,46 +58,6 @@ public void setBackupPath(String backupPath) {
         this.backupPath = backupPath;
     }
 
-    public String getBackupType() {
-        return backupType;
-    }
-
-    public void setBackupType(String backupType) {
-        this.backupType = backupType;
-    }
-
-    public String getCheckpointName() {
-        return checkpointName;
-    }
-
-    public void setCheckpointName(String checkpointName) {
-        this.checkpointName = checkpointName;
-    }
-
-    public String getParentBackupPath() {
-        return parentBackupPath;
-    }
-
-    public void setParentBackupPath(String parentBackupPath) {
-        this.parentBackupPath = parentBackupPath;
-    }
-
-    public String getParentCheckpointName() {
-        return parentCheckpointName;
-    }
-
-    public void setParentCheckpointName(String parentCheckpointName) {
-        this.parentCheckpointName = parentCheckpointName;
-    }
-
-    public String getParentCheckpointPath() {
-        return parentCheckpointPath;
-    }
-
-    public void setParentCheckpointPath(String parentCheckpointPath) {
-        this.parentCheckpointPath = parentCheckpointPath;
-    }
-
     public String getBackupRepoType() {
         return backupRepoType;
     }
@@ -144,14 +98,6 @@ public void setVolumePaths(List<String> volumePaths) {
         this.volumePaths = volumePaths;
     }
 
-    public List<String> getBackupFiles() {
-        return backupFiles;
-    }
-
-    public void setBackupFiles(List<String> backupFiles) {
-        this.backupFiles = backupFiles;
-    }
-
     public Boolean getQuiesce() {
         return quiesce;
     }
diff --git a/plugins/backup/commvault/pom.xml b/plugins/backup/ablestack-commvault/pom.xml
similarity index 96%
rename from plugins/backup/commvault/pom.xml
rename to plugins/backup/ablestack-commvault/pom.xml
index f824d49eb423..55a8a3a0bfec 100644
--- a/plugins/backup/commvault/pom.xml
+++ b/plugins/backup/ablestack-commvault/pom.xml
@@ -21,7 +21,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>cloud-plugin-backup-commvault</artifactId>
-    <name>Apache CloudStack Plugin - KVM Commvault Backup and Recovery Plugin</name>
+    <name>Ablestack Plugin - KVM Commvault Backup and Recovery Plugin</name>
     <parent>
         <artifactId>cloudstack-plugins</artifactId>
         <groupId>org.apache.cloudstack</groupId>
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
similarity index 97%
rename from plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
rename to plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
index 7ef8b6a6d1d6..fcbc5a050248 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/CommvaultBackupProvider.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
@@ -57,7 +57,7 @@
 import org.apache.cloudstack.storage.datastore.db.SnapshotDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
-import org.apache.cloudstack.backup.commvault.CommvaultClient;
+import org.apache.cloudstack.backup.commvault.AblestackCommvaultClient;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDaoImpl;
@@ -98,9 +98,9 @@
 import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
 import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
 
-public class CommvaultBackupProvider extends AdapterBase implements BackupProvider, Configurable {
+public class AblestackCommvaultBackupProvider extends AdapterBase implements BackupProvider, Configurable {
 
-    private static final Logger LOG = LogManager.getLogger(CommvaultBackupProvider.class);
+    private static final Logger LOG = LogManager.getLogger(AblestackCommvaultBackupProvider.class);
     private static final String BACKUP_TYPE_FULL = "FULL";
     private static final String BACKUP_TYPE_INCREMENTAL = "INCREMENTAL";
     private static final String BACKUP_ENGINE_QCOW2 = "QCOW2";
@@ -284,7 +284,7 @@ public Pair<Boolean, Backup> takeBackup(VirtualMachine vm, Boolean quiesceVM) {
             throw new CloudRuntimeException(String.format("Failed to convert API to HOST : %s", e));
         }
         // 백업 중인 작업 조회
-        final CommvaultClient client = getClient(vm.getDataCenterId());
+        final AblestackCommvaultClient client = getClient(vm.getDataCenterId());
         boolean activeJob = client.getActiveJob(vm.getInstanceName());
         if (activeJob) {
             throw new CloudRuntimeException("There are backup jobs running on the virtual machine. Please try again later.");
@@ -484,7 +484,7 @@ private void validateNoVmSnapshots(VirtualMachine vm) {
         }
     }
 
-    private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host vmHost, HostVO vmHostVO, CommvaultClient client,
+    private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host vmHost, HostVO vmHostVO, AblestackCommvaultClient client,
                                                 String planId, String backupPath, String backupContentPath, List<VolumeVO> vmVolumes,
                                                 Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths, Backup latestBackup,
                                                 boolean incrementalBackup, boolean retryAsFullOnFailure) {
@@ -495,7 +495,7 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
         final Map<String, String> backupDetails = getBackupDetails(vm, backupPath, checkpointName, backupEngine, latestBackup, incrementalBackup, vmHost.getName());
 
         BackupVO backupVO = createBackupObject(vm, backupPath, requestedBackupType, backupDetails);
-        CommvaultTakeBackupCommand command = new CommvaultTakeBackupCommand(vm.getInstanceName(), backupPath);
+        AblestackCommvaultTakeBackupCommand command = new AblestackCommvaultTakeBackupCommand(vm.getInstanceName(), backupPath);
         command.setQuiesce(quiesceVM);
         command.setVolumePools(volumePoolsAndPaths.first());
         command.setVolumePaths(volumePoolsAndPaths.second());
@@ -794,7 +794,7 @@ private boolean isLegacyBackup(Backup backup) {
         return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
     }
 
-    private List<String> restoreBackupSourcesOnAdditionalHosts(CommvaultClient client, Backup backup, String executionHostName) {
+    private List<String> restoreBackupSourcesOnAdditionalHosts(AblestackCommvaultClient client, Backup backup, String executionHostName) {
         if (!BACKUP_ENGINE_RBD_DIFF.equals(getBackupDetail(backup, DETAIL_BACKUP_ENGINE))) {
             return Collections.emptyList();
         }
@@ -811,7 +811,7 @@ private List<String> restoreBackupSourcesOnAdditionalHosts(CommvaultClient clien
         return additionalHosts;
     }
 
-    private void restoreBackupRootOnStageHost(CommvaultClient client, Backup backup) {
+    private void restoreBackupRootOnStageHost(AblestackCommvaultClient client, Backup backup) {
         final Pair<String, String> externalIdParts = parseExternalId(backup.getExternalId());
         final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
@@ -899,7 +899,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         } catch (URISyntaxException e) {
             throw new CloudRuntimeException(String.format("Failed to convert API to HOST : %s", e));
         }
-        final CommvaultClient client = getClient(vm.getDataCenterId());
+        final AblestackCommvaultClient client = getClient(vm.getDataCenterId());
         final String externalId = backup.getExternalId();
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
@@ -948,7 +948,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
                         .collect(Collectors.toList());
 
                 LOG.debug("Restoring vm {} from backup {} on the Commvault Backup Provider", vm, backup);
-                CommvaultRestoreBackupCommand restoreCommand = new CommvaultRestoreBackupCommand();
+                AblestackCommvaultRestoreBackupCommand restoreCommand = new AblestackCommvaultRestoreBackupCommand();
                 LOG.info(restoreSourcePath);
                 restoreCommand.setBackupPath(restoreSourcePath);
                 restoreCommand.setVmName(vm.getName());
@@ -1042,7 +1042,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         }
         final String externalId = backup.getExternalId();
         final Long zoneId = backup.getZoneId();
-        final CommvaultClient client = getClient(zoneId);
+        final AblestackCommvaultClient client = getClient(zoneId);
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
         final String restoreSourcePath = getRestoreBackupRootPath(backup);
@@ -1117,7 +1117,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                     restoredVolume.setFormat(Storage.ImageFormat.RAW);
                 }
 
-                CommvaultRestoreBackupCommand restoreCommand = new CommvaultRestoreBackupCommand();
+                AblestackCommvaultRestoreBackupCommand restoreCommand = new AblestackCommvaultRestoreBackupCommand();
                 restoreCommand.setBackupPath(restoreSourcePath);
                 restoreCommand.setVmName(vmNameAndState.first());
                 restoreCommand.setBackupFiles(Collections.singletonList(isLegacyBackup(backup) ? getLegacyBackupFileName(backupVolumeInfo) : getRestoreBackupFilePath(backup, backupVolumeInfo)));
@@ -1187,7 +1187,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
         final String jobId = externalIdParts.second();
-        final CommvaultClient client = getClient(zoneId);
+        final AblestackCommvaultClient client = getClient(zoneId);
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails != null) {
             JSONObject jsonObject = new JSONObject(jobDetails);
@@ -1222,7 +1222,7 @@ public Backup createNewBackupEntryForRestorePoint(Backup.RestorePoint restorePoi
 
     @Override
     public boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backupOffering) {
-        final CommvaultClient client = getClient(vm.getDataCenterId());
+        final AblestackCommvaultClient client = getClient(vm.getDataCenterId());
         final Host host = getVMHypervisorHostForBackup(vm);
         String clientId = client.getClientId(host.getName());
         String applicationId = client.getApplicationId(clientId);
@@ -1313,7 +1313,7 @@ public ConfigKey<?>[] getConfigKeys() {
 
     @Override
     public String getName() {
-        return "commvault";
+        return "ablestack-commvault";
     }
 
     @Override
@@ -1333,7 +1333,7 @@ public void syncBackups(VirtualMachine vm) {
         } catch (URISyntaxException e) {
             return;
         }
-        final CommvaultClient client = getClient(vm.getDataCenterId());
+        final AblestackCommvaultClient client = getClient(vm.getDataCenterId());
         for (final Backup backup: backupDao.listByVmId(vm.getDataCenterId(), vm.getId())) {
             loadBackupDetailsIfNeeded(backup);
             final String externalId = backup.getExternalId();
@@ -1379,7 +1379,7 @@ public void syncBackups(VirtualMachine vm) {
     @Override
     public boolean checkBackupAgent(final Long zoneId) {
         Map<String, String> checkResult = new HashMap<>();
-        final CommvaultClient client = getClient(zoneId);
+        final AblestackCommvaultClient client = getClient(zoneId);
         String csVersionInfo = client.getCvtVersion();
         boolean version = versionCheck(csVersionInfo);
         if (version) {
@@ -1409,7 +1409,7 @@ public boolean checkBackupAgent(final Long zoneId) {
     @Override
     public boolean installBackupAgent(final Long zoneId) {
         Map<String, String> failResult = new HashMap<>();
-        final CommvaultClient client = getClient(zoneId);
+        final AblestackCommvaultClient client = getClient(zoneId);
         List<HostVO> Hosts = hostDao.findByDataCenterId(zoneId);
         for (final HostVO host : Hosts) {
             if (host.getStatus() == Status.Up && host.getHypervisorType() == Hypervisor.HypervisorType.KVM) {
@@ -1464,7 +1464,7 @@ public boolean installBackupAgent(final Long zoneId) {
 
     @Override
     public boolean importBackupPlan(final Long zoneId, final String retentionPeriod, final String externalId) {
-        final CommvaultClient client = getClient(zoneId);
+        final AblestackCommvaultClient client = getClient(zoneId);
         // 선택한 백업 정책의 RPO 편집 Commvault API 호출
         String type = "deleteRpo";
         String taskId = client.getScheduleTaskId(type, externalId);
@@ -1514,7 +1514,7 @@ public boolean importBackupPlan(final Long zoneId, final String retentionPeriod,
 
     @Override
     public boolean updateBackupPlan(final Long zoneId, final String retentionPeriod, final String externalId) {
-        final CommvaultClient client = getClient(zoneId);
+        final AblestackCommvaultClient client = getClient(zoneId);
         String type = "updateRpo";
         String planEntity = client.getScheduleTaskId(type, externalId);
         JSONObject jsonObject = new JSONObject(planEntity);
@@ -1542,9 +1542,9 @@ private static String getUrlDomain(String url) throws URISyntaxException {
         return uri.getHost();
     }
 
-    private CommvaultClient getClient(final Long zoneId) {
+    private AblestackCommvaultClient getClient(final Long zoneId) {
         try {
-            return new CommvaultClient(CommvaultUrl.valueIn(zoneId), CommvaultUsername.valueIn(zoneId), CommvaultPassword.valueIn(zoneId),
+            return new AblestackCommvaultClient(CommvaultUrl.valueIn(zoneId), CommvaultUsername.valueIn(zoneId), CommvaultPassword.valueIn(zoneId),
                     CommvaultValidateSSLSecurity.valueIn(zoneId), CommvaultApiRequestTimeout.valueIn(zoneId));
         } catch (URISyntaxException e) {
             throw new CloudRuntimeException("Failed to parse Commvault API URL: " + e.getMessage());
@@ -1592,7 +1592,7 @@ private void cleanupBackupPathOnStageHost(String clientName, String path, boolea
         if (stageHost == null) {
             throw new CloudRuntimeException(String.format("Unable to find stage host [%s] for backup cleanup", clientName));
         }
-        DeleteBackupCommand command = new DeleteBackupCommand(path, null, null, null, forced);
+        AblestackDeleteBackupCommand command = new AblestackDeleteBackupCommand(path, null, null, null, forced);
         command.setBackupProvider("commvault");
         command.setCheckpointName(checkpointName);
         command.setDiskPaths(diskPaths);
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultBackupOffering.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultBackupOffering.java
similarity index 90%
rename from plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultBackupOffering.java
rename to plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultBackupOffering.java
index c72cd6cd2aa3..9565f9961ff6 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultBackupOffering.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultBackupOffering.java
@@ -19,12 +19,12 @@
 import org.apache.cloudstack.backup.BackupOffering;
 import java.util.Date;
 
-public class CommvaultBackupOffering implements BackupOffering {
+public class AblestackCommvaultBackupOffering implements BackupOffering {
 
     private String name;
     private String uid;
 
-    public CommvaultBackupOffering(String name, String uid) {
+    public AblestackCommvaultBackupOffering(String name, String uid) {
         this.name = name;
         this.uid = uid;
     }
@@ -56,7 +56,7 @@ public boolean isUserDrivenBackupAllowed() {
 
     @Override
     public String getProvider() {
-        return "commvault";
+        return "ablestack-commvault";
     }
 
     @Override
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
similarity index 99%
rename from plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
rename to plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
index fd3ca5c50b7d..860a4d248b97 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultClient.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
@@ -66,8 +66,8 @@
 import java.util.List;
 import java.util.Set;
 
-public class CommvaultClient {
-    private static final Logger LOG = LogManager.getLogger(CommvaultClient.class);
+public class AblestackCommvaultClient {
+    private static final Logger LOG = LogManager.getLogger(AblestackCommvaultClient.class);
     private final URI apiURI;
     private final String apiName;
     private final String apiPassword;
@@ -78,7 +78,7 @@ public class CommvaultClient {
     private String cvtServerPassword;
     private final int cvtServerPort = 22;
 
-    public CommvaultClient(final String url, final String username, final String password, final boolean validateCertificate, final int timeout) throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException {
+    public AblestackCommvaultClient(final String url, final String username, final String password, final boolean validateCertificate, final int timeout) throws URISyntaxException, NoSuchAlgorithmException, KeyManagementException {
 
         apiName = username;
         apiPassword = password;
diff --git a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultObject.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultObject.java
similarity index 91%
rename from plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultObject.java
rename to plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultObject.java
index a0fe576786d3..def6234db775 100644
--- a/plugins/backup/commvault/src/main/java/org/apache/cloudstack/backup/commvault/CommvaultObject.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultObject.java
@@ -18,10 +18,10 @@
 
 import java.util.List;
 
-public interface CommvaultObject {
+public interface AblestackCommvaultObject {
     String getUuid();
     String getName();
     String getHref();
     String getType();
-    List<CommvaultObject> getLinks();
+    List<AblestackCommvaultObject> getLinks();
 }
diff --git a/plugins/backup/commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
similarity index 100%
rename from plugins/backup/commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
rename to plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
diff --git a/plugins/backup/commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml
similarity index 85%
rename from plugins/backup/commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml
rename to plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml
index 11b0848c8577..ca2b2cd38cbe 100644
--- a/plugins/backup/commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml
+++ b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml
@@ -20,7 +20,7 @@
                       http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
 >
 
-    <bean id="commvaultBackupProvider" class="org.apache.cloudstack.backup.CommvaultBackupProvider">
-        <property name="name" value="commvault"/>
+    <bean id="ablestackCommvaultBackupProvider" class="org.apache.cloudstack.backup.AblestackCommvaultBackupProvider">
+        <property name="name" value="ablestack-commvault"/>
     </bean>
 </beans>
diff --git a/plugins/backup/ablestack-nas/pom.xml b/plugins/backup/ablestack-nas/pom.xml
new file mode 100644
index 000000000000..1f81dc673eb1
--- /dev/null
+++ b/plugins/backup/ablestack-nas/pom.xml
@@ -0,0 +1,54 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>cloud-plugin-backup-nas</artifactId>
+    <name>Ablestack Plugin - KVM NAS Backup and Recovery Plugin</name>
+    <parent>
+        <artifactId>cloudstack-plugins</artifactId>
+        <groupId>org.apache.cloudstack</groupId>
+        <version>4.22.0.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-plugin-hypervisor-kvm</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${cs.commons-lang3.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${cs.jackson.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.tomakehurst</groupId>
+            <artifactId>wiremock-standalone</artifactId>
+            <version>${cs.wiremock.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java
new file mode 100644
index 000000000000..8196deeb4a52
--- /dev/null
+++ b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java
@@ -0,0 +1,80 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import java.util.Date;
+
+public class AblestackNasBackupOffering implements BackupOffering {
+
+    private String name;
+    private String uid;
+
+    public NasBackupOffering(String name, String uid) {
+        this.name = name;
+        this.uid = uid;
+    }
+
+    @Override
+    public String getExternalId() {
+        return uid;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public String getDescription() {
+        return "NAS Backup Offering (Repository)";
+    }
+
+    @Override
+    public long getZoneId() {
+        return -1;
+    }
+
+    @Override
+    public boolean isUserDrivenBackupAllowed() {
+        return true;
+    }
+
+    @Override
+    public String getProvider() {
+        return "ablestack-nas";
+    }
+
+    @Override
+    public Date getCreated() {
+        return null;
+    }
+
+    @Override
+    public String getUuid() {
+        return uid;
+    }
+
+    @Override
+    public long getId() {
+        return -1;
+    }
+
+    @Override
+    public String getRetentionPeriod() {
+        return null;
+    }
+}
diff --git a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
new file mode 100644
index 000000000000..c037e287030e
--- /dev/null
+++ b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
@@ -0,0 +1,1037 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.offering.DiskOffering;
+import com.cloud.resource.ResourceManager;
+import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.ScopeType;
+import com.cloud.storage.Storage;
+import com.cloud.storage.Volume;
+import com.cloud.storage.Volume.Type;
+import com.cloud.storage.VolumeApiServiceImpl;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.StoragePoolHostDao;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.Pair;
+import com.cloud.utils.component.AdapterBase;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+import com.cloud.vm.snapshot.VMSnapshot;
+import com.cloud.vm.snapshot.VMSnapshotDetailsVO;
+import com.cloud.vm.snapshot.VMSnapshotVO;
+import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+import com.cloud.vm.snapshot.dao.VMSnapshotDetailsDao;
+
+
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
+import org.apache.cloudstack.framework.config.ConfigKey;
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+
+import javax.inject.Inject;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static org.apache.cloudstack.backup.BackupManager.BackupDeltaMax;
+import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
+import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
+
+public class AblestackNasBackupProvider extends AdapterBase implements BackupProvider, Configurable {
+    private static final Logger LOG = LogManager.getLogger(AblestackNasBackupProvider.class);
+    private static final String BACKUP_TYPE_FULL = "FULL";
+    private static final String BACKUP_TYPE_INCREMENTAL = "INCREMENTAL";
+    private static final String BACKUP_ENGINE_QCOW2 = "QCOW2";
+    private static final String BACKUP_ENGINE_RBD_DIFF = "RBD_DIFF";
+    private static final String DETAIL_CHECKPOINT_NAME = "nas.checkpoint.name";
+    private static final String DETAIL_CHECKPOINT_PATH = "nas.checkpoint.path";
+    private static final String DETAIL_PARENT_BACKUP_UUID = "nas.parent.backup.uuid";
+    private static final String DETAIL_PARENT_BACKUP_PATH = "nas.parent.backup.path";
+    private static final String DETAIL_PARENT_CHECKPOINT_NAME = "nas.parent.checkpoint.name";
+    private static final String DETAIL_PARENT_CHECKPOINT_PATH = "nas.parent.checkpoint.path";
+    private static final String DETAIL_BACKUP_ENGINE = "nas.backup.engine";
+    private static final String DETAIL_RBD_DISK_PATHS = "nas.rbd.disk.paths";
+    private static final String MISSING_PARENT_RBD_SNAPSHOT_ERROR = "Parent RBD snapshot";
+
+    ConfigKey<Integer> NASBackupRestoreMountTimeout = new ConfigKey<>("Advanced", Integer.class,
+            "nas.backup.restore.mount.timeout",
+            "30",
+            "Timeout in seconds after which backup repository mount for restore fails.",
+            true,
+            BackupFrameworkEnabled.key());
+
+    ConfigKey<Integer> NASBackupRestoreTimeout = new ConfigKey<>("Advanced", Integer.class,
+            "nas.backup.restore.timeout",
+            "1800",
+            "Timeout in seconds after which NAS backup restore operations fail.",
+            true,
+            BackupFrameworkEnabled.key());
+
+    @Inject
+    private BackupDao backupDao;
+
+    @Inject
+    private BackupRepositoryDao backupRepositoryDao;
+
+    @Inject
+    private BackupRepositoryService backupRepositoryService;
+
+    @Inject
+    private HostDao hostDao;
+
+    @Inject
+    private VolumeDao volumeDao;
+
+    @Inject
+    private StoragePoolHostDao storagePoolHostDao;
+
+    @Inject
+    private VMInstanceDao vmInstanceDao;
+
+    @Inject
+    private PrimaryDataStoreDao primaryDataStoreDao;
+
+    @Inject
+    DataStoreManager dataStoreMgr;
+
+    @Inject
+    private AgentManager agentManager;
+
+    @Inject
+    private VMSnapshotDao vmSnapshotDao;
+
+    @Inject
+    private VMSnapshotDetailsDao vmSnapshotDetailsDao;
+
+    @Inject
+    BackupManager backupManager;
+
+    @Inject
+    ResourceManager resourceManager;
+
+    @Inject
+    private DiskOfferingDao diskOfferingDao;
+
+    private Long getClusterIdFromRootVolume(VirtualMachine vm) {
+        VolumeVO rootVolume = volumeDao.getInstanceRootVolume(vm.getId());
+        StoragePoolVO rootDiskPool = primaryDataStoreDao.findById(rootVolume.getPoolId());
+        if (rootDiskPool == null) {
+            return null;
+        }
+        return rootDiskPool.getClusterId();
+    }
+
+    protected Host getVMHypervisorHost(VirtualMachine vm) {
+        Long hostId = vm.getLastHostId();
+        Long clusterId = null;
+
+        if (hostId != null) {
+            Host host = hostDao.findById(hostId);
+            if (host.getStatus() == Status.Up) {
+                return host;
+            }
+            // Try to find any Up host in the same cluster
+            clusterId = host.getClusterId();
+        } else {
+            // Try to find any Up host in the same cluster as the root volume
+            clusterId = getClusterIdFromRootVolume(vm);
+        }
+
+        if (clusterId != null) {
+            for (final Host hostInCluster : hostDao.findHypervisorHostInCluster(clusterId)) {
+                if (hostInCluster.getStatus() == Status.Up) {
+                    LOG.debug("Found Host {} in cluster {}", hostInCluster, clusterId);
+                    return hostInCluster;
+                }
+            }
+        }
+
+        // Try to find any Host in the zone
+        return resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, vm.getDataCenterId());
+    }
+
+    protected Host getVMHypervisorHostForBackup(VirtualMachine vm) {
+        Long hostId = vm.getHostId();
+        if (hostId == null && VirtualMachine.State.Running.equals(vm.getState())) {
+            throw new CloudRuntimeException(String.format("Unable to find the hypervisor host for %s. Make sure the virtual machine is running", vm.getName()));
+        }
+        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
+            hostId = vm.getLastHostId();
+        }
+        if (hostId == null) {
+            throw new CloudRuntimeException(String.format("Unable to find the hypervisor host for stopped VM: %s", vm));
+        }
+        final Host host = hostDao.findById(hostId);
+        if (host == null || !Status.Up.equals(host.getStatus()) || !Hypervisor.HypervisorType.KVM.equals(host.getHypervisorType())) {
+            throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
+        }
+        return host;
+    }
+
+    @Override
+    public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesceVM) {
+        final Host host = getVMHypervisorHostForBackup(vm);
+
+        final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(vm.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException("No valid backup repository found for the VM, please check the attached backup offering");
+        }
+
+        validateNoVmSnapshots(vm);
+        List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+        vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
+        Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
+        validateVolumePoolTypes(volumePoolsAndPaths.first());
+        final BackupVO latestBackup = getLatestBackedUpBackup(vm);
+        final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup);
+        BackupExecutionResult result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, latestBackup, incrementalBackup,
+                incrementalBackup && vmVolumes.size() > 1);
+        if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
+            cleanupFailedBackupForFullRetry(result.backup);
+            LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
+            result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, null, false, false);
+        }
+        return new Pair<>(result.success, result.backup);
+    }
+
+    private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host host, BackupRepository backupRepository,
+                                                List<VolumeVO> vmVolumes, Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths,
+                                                Backup parentBackup, boolean incrementalBackup, boolean retryAsFullOnFailure) {
+        final String backupPath = buildBackupPath(vm);
+        final String checkpointName = backupPath.substring(backupPath.lastIndexOf("/") + 1);
+        final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
+        final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
+
+        BackupVO backupVO = createBackupObject(vm, backupPath, incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL,
+                checkpointName, backupEngine, incrementalBackup ? parentBackup : null, volumePoolsAndPaths.second());
+        AblestackNasTakeBackupCommand command = new AblestackNasTakeBackupCommand(vm.getInstanceName(), backupPath);
+        command.setBackupType(backupVO.getType());
+        command.setCheckpointName(checkpointName);
+        command.setBackupFiles(backupFiles);
+        command.setVolumePools(volumePoolsAndPaths.first());
+        command.setVolumePaths(volumePoolsAndPaths.second());
+        if (incrementalBackup && parentBackup != null) {
+            command.setParentBackupPath(parentBackup.getExternalId());
+            command.setParentCheckpointName(getBackupDetail(parentBackup, DETAIL_CHECKPOINT_NAME));
+            command.setParentCheckpointPath(getBackupDetail(parentBackup, DETAIL_CHECKPOINT_PATH));
+        }
+        command.setBackupRepoType(backupRepository.getType());
+        command.setBackupRepoAddress(backupRepository.getAddress());
+        command.setMountOptions(backupRepository.getMountOptions());
+        command.setQuiesce(quiesceVM);
+
+        BackupAnswer answer;
+        try {
+            answer = (BackupAnswer) agentManager.send(host.getId(), command);
+        } catch (AgentUnavailableException e) {
+            logger.error("Unable to contact backend control plane to initiate backup for VM {}", vm.getInstanceName());
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+            throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            logger.error("Operation to initiate backup timed out for VM {}", vm.getInstanceName());
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+            throw new CloudRuntimeException("Operation to initiate backup timed out, please try again");
+        }
+
+        if (answer != null && answer.getResult()) {
+            backupVO.setDate(new Date());
+            backupVO.setSize(answer.getSize());
+            backupVO.setStatus(Backup.Status.BackedUp);
+            backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
+            if (backupDao.update(backupVO.getId(), backupVO)) {
+                return BackupExecutionResult.success(backupVO);
+            }
+            throw new CloudRuntimeException("Failed to update backup");
+        }
+
+        final String details = answer != null ? answer.getDetails() : "No answer received";
+        logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), details);
+        if (retryAsFullOnFailure) {
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+        } else if (answer != null && answer.getNeedsCleanup()) {
+            logger.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
+            backupVO.setStatus(Backup.Status.Error);
+            backupDao.update(backupVO.getId(), backupVO);
+        } else {
+            backupVO.setStatus(Backup.Status.Failed);
+            backupDao.remove(backupVO.getId());
+        }
+        return BackupExecutionResult.failure(details, backupVO);
+    }
+
+    private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult result, List<VolumeVO> vmVolumes) {
+        if (result == null || result.success) {
+            return false;
+        }
+        if (StringUtils.contains(result.details, MISSING_PARENT_RBD_SNAPSHOT_ERROR)) {
+            return true;
+        }
+        return vmVolumes.size() > 1;
+    }
+
+    private void cleanupFailedBackupForFullRetry(Backup backup) {
+        if (backup == null) {
+            return;
+        }
+        backupDao.remove(backup.getId());
+    }
+
+    private static final class BackupExecutionResult {
+        private final boolean success;
+        private final Backup backup;
+        private final String details;
+
+        private BackupExecutionResult(boolean success, Backup backup, String details) {
+            this.success = success;
+            this.backup = backup;
+            this.details = details;
+        }
+
+        private static BackupExecutionResult success(Backup backup) {
+            return new BackupExecutionResult(true, backup, null);
+        }
+
+        private static BackupExecutionResult failure(String details, Backup backup) {
+            return new BackupExecutionResult(false, backup, details);
+        }
+    }
+
+    private String buildBackupPath(VirtualMachine vm) {
+        return String.format("%s/%s", vm.getInstanceName(),
+                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS").format(new Date()));
+    }
+
+    private void validateNoVmSnapshots(VirtualMachine vm) {
+        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVm(vm.getId()))) {
+            logger.debug("NAS backup provider cannot take backups of a VM [{}] with VM snapshots.", vm);
+            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has VM snapshots.", vm.getUuid()));
+        }
+    }
+
+    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, String checkpointName, String backupEngine, Backup parentBackup,
+                                        List<String> diskPaths) {
+        BackupVO backup = new BackupVO();
+        backup.setVmId(vm.getId());
+        backup.setExternalId(backupPath);
+        backup.setType(backupType);
+        backup.setDate(new Date());
+        long virtualSize = 0L;
+        for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
+            if (Volume.State.Ready.equals(volume.getState())) {
+                virtualSize += volume.getSize();
+            }
+        }
+        backup.setProtectedSize(virtualSize);
+        backup.setStatus(Backup.Status.BackingUp);
+        backup.setBackupOfferingId(vm.getBackupOfferingId());
+        backup.setAccountId(vm.getAccountId());
+        backup.setDomainId(vm.getDomainId());
+        backup.setZoneId(vm.getDataCenterId());
+        backup.setName(backupManager.getBackupNameFromVM(vm));
+        Map<String, String> details = new HashMap<>();
+        Map<String, String> backupDetails = backupManager.getBackupDetailsFromVM(vm);
+        if (backupDetails != null) {
+            details.putAll(backupDetails);
+        }
+        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
+        details.put(DETAIL_CHECKPOINT_PATH, getCheckpointPath(backupPath, checkpointName, backupEngine));
+        details.put(DETAIL_BACKUP_ENGINE, backupEngine);
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine) && CollectionUtils.isNotEmpty(diskPaths)) {
+            details.put(DETAIL_RBD_DISK_PATHS, String.join(",", diskPaths));
+        }
+        if (parentBackup != null) {
+            details.put(DETAIL_PARENT_BACKUP_UUID, parentBackup.getUuid());
+            details.put(DETAIL_PARENT_BACKUP_PATH, parentBackup.getExternalId());
+            details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(parentBackup, DETAIL_CHECKPOINT_NAME));
+            details.put(DETAIL_PARENT_CHECKPOINT_PATH, getBackupDetail(parentBackup, DETAIL_CHECKPOINT_PATH));
+        }
+        backup.setDetails(details);
+
+        return backupDao.persist(backup);
+    }
+
+    private String getCheckpointPath(String backupPath, String checkpointName, String backupEngine) {
+        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            return String.format("%s/checkpoints/%s.meta", backupPath, checkpointName);
+        }
+        return String.format("%s/checkpoints/%s.xml", backupPath, checkpointName);
+    }
+
+    private BackupVO getLatestBackedUpBackup(VirtualMachine vm) {
+        List<Backup> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId());
+        return backups.stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
+                .peek(backupDao::loadDetails)
+                .filter(backup -> getBackupDetail(backup, DETAIL_CHECKPOINT_NAME) != null)
+                .max(Comparator.comparing(BackupVO::getDate))
+                .orElse(null);
+    }
+
+    private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBackup) {
+        if (latestBackup == null) {
+            return false;
+        }
+
+        final Long clusterId = getClusterIdFromRootVolume(vm);
+        if (clusterId == null) {
+            LOG.debug("Unable to resolve cluster for VM [{}], fallback to full backup.", vm);
+            return false;
+        }
+
+        if (!KvmIncrementalBackup.valueIn(clusterId)) {
+            return false;
+        }
+
+        return getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+    }
+
+    private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {
+        List<BackupVO> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId()).stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
+                .peek(backupDao::loadDetails)
+                .collect(Collectors.toList());
+        Map<String, BackupVO> backupsByUuid = backups.stream().collect(Collectors.toMap(BackupVO::getUuid, backup -> backup, (left, right) -> left));
+        int chainSize = 1;
+        Backup current = latestBackup;
+        while (current != null) {
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            if (parentBackupUuid == null) {
+                break;
+            }
+            current = backupsByUuid.get(parentBackupUuid);
+            if (current != null) {
+                chainSize++;
+            }
+        }
+        return chainSize;
+    }
+
+    private boolean hasDependentBackups(Backup backup) {
+        List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
+        return backups.stream()
+                .filter(BackupVO.class::isInstance)
+                .map(BackupVO.class::cast)
+                .filter(candidate -> !Objects.equals(candidate.getId(), backup.getId()))
+                .peek(backupDao::loadDetails)
+                .anyMatch(candidate -> Objects.equals(getBackupDetail(candidate, DETAIL_PARENT_BACKUP_UUID), backup.getUuid()));
+    }
+
+    private String getBackupDetail(Backup backup, String key) {
+        Map<String, String> details = backup.getDetails();
+        return details != null ? details.get(key) : null;
+    }
+
+    private void validateVolumePoolTypes(List<PrimaryDataStoreTO> volumePools) {
+        boolean hasRbd = volumePools.stream().anyMatch(pool -> pool != null && Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
+        boolean hasNonRbd = volumePools.stream().anyMatch(pool -> pool != null && !Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
+        if (hasRbd && hasNonRbd) {
+            throw new CloudRuntimeException("NAS incremental backup does not support VMs with mixed RBD and non-RBD volumes");
+        }
+    }
+
+    private boolean areAllVolumesOnRbdPool(List<PrimaryDataStoreTO> volumePools) {
+        return CollectionUtils.isNotEmpty(volumePools) &&
+                volumePools.stream().allMatch(pool -> pool != null && Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
+    }
+
+    private List<String> buildBackupFileNames(List<VolumeVO> volumes, String backupEngine, boolean incrementalBackup) {
+        List<String> backupFiles = new ArrayList<>();
+        for (VolumeVO volume : volumes) {
+            String suffix;
+            if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+                suffix = incrementalBackup ? ".rbdiff" : ".raw";
+            } else {
+                suffix = ".qcow2";
+            }
+            backupFiles.add(String.format("volume-%s%s", volume.getUuid(), suffix));
+        }
+        return backupFiles;
+    }
+
+    private String createVolumeInfoFromVolumes(List<VolumeVO> volumes, List<String> backupFiles) {
+        List<Backup.VolumeInfo> infoList = new ArrayList<>();
+        for (int i = 0; i < volumes.size(); i++) {
+            VolumeVO vol = volumes.get(i);
+            DiskOffering diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
+            String diskOfferingUuid = diskOffering != null ? diskOffering.getUuid() : null;
+            infoList.add(new Backup.VolumeInfo(vol.getUuid(), backupFiles.get(i), vol.getVolumeType(), vol.getSize(),
+                    vol.getDeviceId(), diskOfferingUuid, vol.getMinIops(), vol.getMaxIops()));
+        }
+        return new com.google.gson.Gson().toJson(infoList.toArray(), Backup.VolumeInfo[].class);
+    }
+
+    @Override
+    public Pair<Boolean, String> restoreBackupToVM(VirtualMachine vm, Backup backup, String hostIp, String dataStoreUuid) {
+        return restoreVMBackup(vm, backup);
+    }
+
+    @Override
+    public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
+        return restoreVMBackup(vm, backup).first();
+    }
+
+    private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup) {
+        List<Backup.VolumeInfo> backupVolumes = backup.getBackedUpVolumes();
+        List<String> backedVolumesUUIDs = backupVolumes.stream()
+                .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
+                .map(Backup.VolumeInfo::getUuid)
+                .collect(Collectors.toList());
+
+        List<VolumeVO> restoreVolumes = volumeDao.findByInstance(vm.getId()).stream()
+                .sorted(Comparator.comparingLong(VolumeVO::getDeviceId))
+                .collect(Collectors.toList());
+
+        LOG.debug("Restoring vm {} from backup {} on the NAS Backup Provider", vm, backup);
+        BackupRepository backupRepository = getBackupRepository(backup);
+
+        final Host host = getVMHypervisorHost(vm);
+        AblestackNasRestoreBackupCommand restoreCommand = new AblestackNasRestoreBackupCommand();
+        restoreCommand.setBackupPath(backup.getExternalId());
+        restoreCommand.setBackupRepoType(backupRepository.getType());
+        restoreCommand.setBackupRepoAddress(backupRepository.getAddress());
+        restoreCommand.setMountOptions(backupRepository.getMountOptions());
+        restoreCommand.setVmName(vm.getName());
+        restoreCommand.setBackupVolumesUUIDs(backedVolumesUUIDs);
+        Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(restoreVolumes);
+        restoreCommand.setRestoreVolumePools(volumePoolsAndPaths.first());
+        restoreCommand.setRestoreVolumePaths(volumePoolsAndPaths.second());
+        restoreCommand.setVolumePaths(getVolumePaths(restoreVolumes));
+        restoreCommand.setBackupFiles(getBackupFiles(backupVolumes, backup));
+        restoreCommand.setBackupFileChains(getBackupFileChains(backupVolumes, backup));
+        restoreCommand.setVmExists(vm.getRemoved() == null);
+        restoreCommand.setVmState(vm.getState());
+        restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
+        restoreCommand.setWait(NASBackupRestoreTimeout.value());
+
+        BackupAnswer answer;
+        try {
+            answer = (BackupAnswer) agentManager.send(host.getId(), restoreCommand);
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to restore backup timed out, please try again");
+        }
+        return new Pair<>(answer.getResult(), answer.getDetails());
+    }
+
+    private List<String> getBackupFiles(List<Backup.VolumeInfo> backedVolumes, Backup backup) {
+        List<String> backupFiles = new ArrayList<>();
+        List<Backup.VolumeInfo> sortedVolumes = new ArrayList<>(backedVolumes);
+        sortedVolumes.sort(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId));
+        for (Backup.VolumeInfo backedVolume : sortedVolumes) {
+            if (isLegacyBackup(backup)) {
+                backupFiles.add(getLegacyBackupFileName(backedVolume));
+            } else {
+                backupFiles.add(backedVolume.getPath());
+            }
+        }
+        return backupFiles;
+    }
+
+    private List<String> getBackupFileChains(List<Backup.VolumeInfo> backedVolumes, Backup backup) {
+        List<String> backupFileChains = new ArrayList<>();
+        List<Backup.VolumeInfo> sortedVolumes = new ArrayList<>(backedVolumes);
+        sortedVolumes.sort(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId));
+        for (Backup.VolumeInfo backedVolume : sortedVolumes) {
+            backupFileChains.add(String.join(";", getBackupFileChain(backedVolume.getUuid(), backup)));
+        }
+        return backupFileChains;
+    }
+
+    private List<String> getBackupFileChain(String volumeUuid, Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
+        if (isLegacyBackup(backup)) {
+            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
+            return volumeInfo != null ? getLegacyBackupFileCandidates(volumeInfo) : List.of();
+        }
+
+        String backupEngine = getBackupDetail(backup, DETAIL_BACKUP_ENGINE);
+        if (!BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
+            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
+            return volumeInfo != null ? List.of(volumeInfo.getPath()) : List.of();
+        }
+
+        List<Backup> chain = getBackupChain(backup);
+        List<String> files = new ArrayList<>();
+        for (Backup chainBackup : chain) {
+            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(chainBackup.getBackedUpVolumes(), volumeUuid);
+            if (volumeInfo != null) {
+                files.add(String.format("%s/%s", chainBackup.getExternalId(), volumeInfo.getPath()));
+            }
+        }
+        return files;
+    }
+
+    private List<Backup> getBackupChain(Backup backup) {
+        loadBackupDetailsIfNeeded(backup);
+        List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
+        Map<String, Backup> backupsByUuid = new HashMap<>();
+        for (Backup candidate : backups) {
+            if (candidate instanceof BackupVO) {
+                backupDao.loadDetails((BackupVO) candidate);
+            }
+            backupsByUuid.put(candidate.getUuid(), candidate);
+        }
+
+        List<Backup> chain = new ArrayList<>();
+        Backup current = backup;
+        while (current != null) {
+            chain.add(current);
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            current = parentBackupUuid != null ? backupsByUuid.get(parentBackupUuid) : null;
+        }
+        Collections.reverse(chain);
+        return chain;
+    }
+
+    private void loadBackupDetailsIfNeeded(Backup backup) {
+        if (backup instanceof BackupVO && backup.getDetails() == null) {
+            backupDao.loadDetails((BackupVO) backup);
+        }
+    }
+
+    private boolean isLegacyBackup(Backup backup) {
+        return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
+    }
+
+    private String getLegacyBackupFileName(Backup.VolumeInfo volumeInfo) {
+        String volumePath = volumeInfo.getPath();
+        if (StringUtils.isNotBlank(volumePath) &&
+                (volumePath.endsWith(".qcow2") || volumePath.endsWith(".raw") || volumePath.endsWith(".rbdiff"))) {
+            return volumePath;
+        }
+        String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
+        return String.format("%s.%s.qcow2", diskPrefix, volumeInfo.getPath());
+    }
+
+    private List<String> getLegacyBackupFileCandidates(Backup.VolumeInfo volumeInfo) {
+        List<String> candidates = new ArrayList<>();
+        String volumePath = volumeInfo.getPath();
+        if (StringUtils.isNotBlank(volumePath)) {
+            candidates.add(volumePath);
+            if (volumePath.contains("/")) {
+                String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
+                if (!Objects.equals(volumePath, baseName)) {
+                    candidates.add(baseName);
+                }
+            }
+        }
+
+        String legacyFileName = getLegacyBackupFileName(volumeInfo);
+        if (!candidates.contains(legacyFileName)) {
+            candidates.add(legacyFileName);
+        }
+
+        if (volumePath != null && volumePath.contains("/")) {
+            String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
+            String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
+            String baseNameLegacyFile = String.format("%s.%s.qcow2", diskPrefix, baseName);
+            if (!candidates.contains(baseNameLegacyFile)) {
+                candidates.add(baseNameLegacyFile);
+            }
+        }
+
+        return candidates;
+    }
+
+    private List<String> getVolumePaths(List<VolumeVO> volumes) {
+        List<String> volumePaths = new ArrayList<>();
+        for (VolumeVO volume : volumes) {
+            StoragePoolVO storagePool = primaryDataStoreDao.findById(volume.getPoolId());
+            if (Objects.isNull(storagePool)) {
+                throw new CloudRuntimeException("Unable to find storage pool associated to the volume");
+            }
+            String volumePathPrefix;
+            if (ScopeType.HOST.equals(storagePool.getScope())) {
+                volumePathPrefix = storagePool.getPath();
+            } else if (Storage.StoragePoolType.SharedMountPoint.equals(storagePool.getPoolType())) {
+                volumePathPrefix = storagePool.getPath();
+            } else {
+                volumePathPrefix = String.format("/mnt/%s", storagePool.getUuid());
+            }
+            volumePaths.add(String.format("%s/%s", volumePathPrefix, volume.getPath()));
+        }
+        return volumePaths;
+    }
+
+    private Pair<List<PrimaryDataStoreTO>, List<String>> getVolumePoolsAndPaths(List<VolumeVO> volumes) {
+        List<PrimaryDataStoreTO> volumePools = new ArrayList<>();
+        List<String> volumePaths = new ArrayList<>();
+        for (VolumeVO volume : volumes) {
+            StoragePoolVO storagePool = primaryDataStoreDao.findById(volume.getPoolId());
+            if (Objects.isNull(storagePool)) {
+                throw new CloudRuntimeException("Unable to find storage pool associated to the volume");
+            }
+
+            DataStore dataStore = dataStoreMgr.getDataStore(storagePool.getId(), DataStoreRole.Primary);
+            volumePools.add(dataStore != null ? (PrimaryDataStoreTO)dataStore.getTO() : null);
+
+            String volumePathPrefix = getVolumePathPrefix(storagePool);
+            volumePaths.add(String.format("%s/%s", volumePathPrefix, volume.getPath()));
+        }
+        return new Pair<>(volumePools, volumePaths);
+    }
+
+    private String getVolumePathPrefix(StoragePoolVO storagePool) {
+        String volumePathPrefix;
+        if (ScopeType.HOST.equals(storagePool.getScope()) ||
+                Storage.StoragePoolType.SharedMountPoint.equals(storagePool.getPoolType()) ||
+                Storage.StoragePoolType.RBD.equals(storagePool.getPoolType())) {
+            volumePathPrefix = storagePool.getPath();
+        } else {
+            // Should be Storage.StoragePoolType.NetworkFilesystem
+            volumePathPrefix = String.format("/mnt/%s", storagePool.getUuid());
+        }
+        return volumePathPrefix;
+    }
+
+    @Override
+    public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeInfo backupVolumeInfo, String hostIp, String dataStoreUuid, Pair<String, VirtualMachine.State> vmNameAndState) {
+        final VolumeVO volume = volumeDao.findByUuid(backupVolumeInfo.getUuid());
+        final DiskOffering diskOffering = diskOfferingDao.findByUuid(backupVolumeInfo.getDiskOfferingId());
+        String cacheMode = null;
+        final VMInstanceVO vm = vmInstanceDao.findVMByInstanceName(vmNameAndState.first());
+        List<VolumeVO> listVolumes = volumeDao.findByInstanceAndType(vm.getId(), Type.ROOT);
+        if(CollectionUtils.isNotEmpty(listVolumes)) {
+            VolumeVO rootDisk = listVolumes.get(0);
+            DiskOffering baseDiskOffering = diskOfferingDao.findById(rootDisk.getDiskOfferingId());
+            if (baseDiskOffering.getCacheMode() != null) {
+                cacheMode = baseDiskOffering.getCacheMode().toString();
+            }
+        }
+        StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
+        if (pool == null) {
+            List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(dataStoreUuid);
+            pool = pools.get(0);
+        }
+        HostVO hostVO = hostDao.findByIp(hostIp);
+        if (hostVO == null) {
+            hostVO = hostDao.findByName(hostIp);
+        }
+
+        Backup.VolumeInfo matchingVolume = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volume.getUuid());
+        if (matchingVolume == null) {
+            throw new CloudRuntimeException(String.format("Unable to find volume %s in the list of backed up volumes for backup %s, cannot proceed with restore", volume.getUuid(), backup));
+        }
+        Long backedUpVolumeSize = matchingVolume.getSize();
+
+        LOG.debug("Restoring vm volume {} from backup {} on the NAS Backup Provider", volume, backup);
+        BackupRepository backupRepository = getBackupRepository(backup);
+
+        VolumeVO restoredVolume = new VolumeVO(Volume.Type.DATADISK, null, backup.getZoneId(),
+                backup.getDomainId(), backup.getAccountId(), 0, null,
+                backup.getSize(), null, null, null);
+        String volumeUUID = UUID.randomUUID().toString();
+        String volumeName = volume != null ? volume.getName() : backupVolumeInfo.getUuid();
+        restoredVolume.setName("RestoredVol-" + volumeName);
+        restoredVolume.setProvisioningType(diskOffering.getProvisioningType());
+        restoredVolume.setUpdated(new Date());
+        restoredVolume.setUuid(volumeUUID);
+        restoredVolume.setRemoved(null);
+        restoredVolume.setDisplayVolume(true);
+        restoredVolume.setPoolId(pool.getId());
+        restoredVolume.setPoolType(pool.getPoolType());
+        restoredVolume.setPath(restoredVolume.getUuid());
+        restoredVolume.setState(Volume.State.Copying);
+        restoredVolume.setSize(backupVolumeInfo.getSize());
+        restoredVolume.setDiskOfferingId(diskOffering.getId());
+        if (pool.getPoolType() != Storage.StoragePoolType.RBD) {
+            restoredVolume.setFormat(Storage.ImageFormat.QCOW2);
+        } else {
+            restoredVolume.setFormat(Storage.ImageFormat.RAW);
+        }
+
+        AblestackNasRestoreBackupCommand restoreCommand = new AblestackNasRestoreBackupCommand();
+        restoreCommand.setBackupPath(backup.getExternalId());
+        restoreCommand.setBackupRepoType(backupRepository.getType());
+        restoreCommand.setBackupRepoAddress(backupRepository.getAddress());
+        restoreCommand.setVmName(vmNameAndState.first());
+        restoreCommand.setRestoreVolumePaths(Collections.singletonList(String.format("%s/%s", getVolumePathPrefix(pool), volumeUUID)));
+        DataStore dataStore = dataStoreMgr.getDataStore(pool.getId(), DataStoreRole.Primary);
+        restoreCommand.setRestoreVolumePools(Collections.singletonList(dataStore != null ? (PrimaryDataStoreTO)dataStore.getTO() : null));
+        restoreCommand.setDiskType(backupVolumeInfo.getType().name().toLowerCase(Locale.ROOT));
+        restoreCommand.setMountOptions(backupRepository.getMountOptions());
+        restoreCommand.setVmExists(null);
+        restoreCommand.setVmState(vmNameAndState.second());
+        restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
+        restoreCommand.setWait(NASBackupRestoreTimeout.value());
+        restoreCommand.setCacheMode(cacheMode);
+        restoreCommand.setVolumePaths(Collections.singletonList(String.format("%s/%s", pool.getPath(), volumeUUID)));
+        restoreCommand.setBackupFiles(getBackupFiles(Collections.singletonList(matchingVolume), backup));
+        restoreCommand.setBackupFileChains(Collections.singletonList(String.join(";", getBackupFileChain(matchingVolume.getUuid(), backup))));
+
+        BackupAnswer answer;
+        try {
+            answer = (BackupAnswer) agentManager.send(hostVO.getId(), restoreCommand);
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to restore backed up volume timed out, please try again");
+        }
+
+        if (answer.getResult()) {
+            try {
+                volumeDao.persist(restoredVolume);
+            } catch (Exception e) {
+                throw new CloudRuntimeException("Unable to create restored volume due to: " + e);
+            }
+        }
+
+        return new Pair<>(answer.getResult(), answer.getDetails());
+    }
+
+    private BackupRepository getBackupRepository(Backup backup) {
+        BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backup.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException(String.format("No valid backup repository found for the backup %s, please check the attached backup offering", backup.getUuid()));
+        }
+        return backupRepository;
+    }
+
+    private Backup.VolumeInfo getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUpVolumes, String volumeUuid) {
+        return backedUpVolumes.stream()
+                .filter(v -> v.getUuid().equals(volumeUuid))
+                .findFirst()
+                .orElse(null);
+    }
+
+    @Override
+    public boolean deleteBackup(Backup backup, boolean forced) {
+        if (backup instanceof BackupVO && backup.getDetails() == null) {
+            backupDao.loadDetails((BackupVO) backup);
+        }
+        if (!forced && hasDependentBackups(backup)) {
+            throw new CloudRuntimeException(String.format("Backup [%s] cannot be deleted because one or more incremental backups depend on it.", backup.getUuid()));
+        }
+
+        final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backup.getBackupOfferingId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException("No valid backup repository found for the VM, please check the attached backup offering");
+        }
+
+        final Host host;
+        final VirtualMachine vm = vmInstanceDao.findByIdIncludingRemoved(backup.getVmId());
+        if (vm != null) {
+            host = getVMHypervisorHost(vm);
+        } else {
+            host = resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, backup.getZoneId());
+        }
+
+        AblestackDeleteBackupCommand command = new AblestackDeleteBackupCommand(backup.getExternalId(), backupRepository.getType(),
+                backupRepository.getAddress(), backupRepository.getMountOptions(), forced);
+        command.setBackupProvider("nas");
+        command.setCheckpointName(getBackupDetail(backup, DETAIL_CHECKPOINT_NAME));
+        command.setDiskPaths(getBackupDetail(backup, DETAIL_RBD_DISK_PATHS));
+
+        BackupAnswer answer;
+        try {
+            answer = (BackupAnswer) agentManager.send(host.getId(), command);
+        } catch (AgentUnavailableException e) {
+            throw new CloudRuntimeException("Unable to contact backend control plane to initiate backup");
+        } catch (OperationTimedoutException e) {
+            throw new CloudRuntimeException("Operation to delete backup timed out, please try again");
+        }
+
+        if (answer != null && answer.getResult()) {
+            return true;
+        }
+
+        logger.debug("There was an error removing the backup with id {}", backup.getId());
+        return false;
+    }
+
+    public void syncBackupMetrics(Long zoneId) {
+    }
+
+    @Override
+    public List<Backup.RestorePoint> listRestorePoints(VirtualMachine vm) {
+        return null;
+    }
+
+    @Override
+    public Backup createNewBackupEntryForRestorePoint(Backup.RestorePoint restorePoint, VirtualMachine vm) {
+        return null;
+    }
+
+    @Override
+    public boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backupOffering) {
+        for (VMSnapshotVO vmSnapshotVO : vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.Disk)) {
+            List<VMSnapshotDetailsVO> vmSnapshotDetails = vmSnapshotDetailsDao.listDetails(vmSnapshotVO.getId());
+            if (vmSnapshotDetails.stream().anyMatch(vmSnapshotDetailsVO -> VolumeApiServiceImpl.KVM_FILE_BASED_STORAGE_SNAPSHOT.equals(vmSnapshotDetailsVO.getName()))) {
+                logger.warn("VM [{}] has VM snapshots using the KvmFileBasedStorageVmSnapshot Strategy; this provider does not support backups on VMs with these snapshots!");
+                return false;
+            }
+        }
+
+        return Hypervisor.HypervisorType.KVM.equals(vm.getHypervisorType());
+    }
+
+    @Override
+    public boolean removeVMFromBackupOffering(VirtualMachine vm) {
+        return true;
+    }
+
+    @Override
+    public boolean willDeleteBackupsOnOfferingRemoval() {
+        return false;
+    }
+
+    @Override
+    public boolean supportsInstanceFromBackup() {
+        return true;
+    }
+
+    @Override
+    public boolean supportsMemoryVmSnapshot() {
+        return false;
+    }
+
+    @Override
+    public Pair<Long, Long> getBackupStorageStats(Long zoneId) {
+        final List<BackupRepository> repositories = backupRepositoryDao.listByZoneAndProvider(zoneId, getName());
+        Long totalSize = 0L;
+        Long usedSize = 0L;
+        for (final BackupRepository repository : repositories) {
+            if (repository.getCapacityBytes() != null) {
+                totalSize += repository.getCapacityBytes();
+            }
+            if (repository.getUsedBytes() != null) {
+                usedSize += repository.getUsedBytes();
+            }
+        }
+        return new Pair<>(usedSize, totalSize);
+    }
+
+    @Override
+    public void syncBackupStorageStats(Long zoneId) {
+        final List<BackupRepository> repositories = backupRepositoryDao.listByZoneAndProvider(zoneId, getName());
+        final Host host = resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, zoneId);
+        for (final BackupRepository repository : repositories) {
+            GetBackupStorageStatsCommand command = new GetBackupStorageStatsCommand(repository.getType(), repository.getAddress(), repository.getMountOptions());
+            BackupStorageStatsAnswer answer;
+            try {
+                answer = (BackupStorageStatsAnswer) agentManager.send(host.getId(), command);
+                backupRepositoryDao.updateCapacity(repository, answer.getTotalSize(), answer.getUsedSize());
+            } catch (AgentUnavailableException e) {
+                logger.warn("Unable to contact backend control plane to get backup stats for repository: {}", repository.getName());
+            } catch (OperationTimedoutException e) {
+                logger.warn("Operation to get backup stats timed out for the repository: " + repository.getName());
+            }
+        }
+    }
+
+    @Override
+    public List<BackupOffering> listBackupOfferings(Long zoneId) {
+        final List<BackupRepository> repositories = backupRepositoryDao.listByZoneAndProvider(zoneId, getName());
+        final List<BackupOffering> offerings = new ArrayList<>();
+        for (final BackupRepository repository : repositories) {
+            offerings.add(new NasBackupOffering(repository.getName(), repository.getUuid()));
+        }
+        return offerings;
+    }
+
+    @Override
+    public boolean isValidProviderOffering(Long zoneId, String uuid) {
+        return true;
+    }
+
+    @Override
+    public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
+        final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backupOffering.getId());
+        if (backupRepository == null) {
+            throw new CloudRuntimeException("Backup repository not found for the backup offering" + backupOffering.getName());
+        }
+        return Boolean.TRUE.equals(backupRepository.crossZoneInstanceCreationEnabled());
+    }
+
+    @Override
+    public ConfigKey<?>[] getConfigKeys() {
+        return new ConfigKey[]{
+                NASBackupRestoreMountTimeout,
+                NASBackupRestoreTimeout
+        };
+    }
+
+    @Override
+    public String getName() {
+        return "ablestack-nas";
+    }
+
+    @Override
+    public String getDescription() {
+        return "NAS Backup Plugin";
+    }
+
+    @Override
+    public String getConfigComponentName() {
+        return BackupService.class.getSimpleName();
+    }
+
+    @Override
+    public void syncBackups(VirtualMachine vm) {
+    }
+
+    @Override
+    public boolean checkBackupAgent(final Long zoneId) { return true; }
+
+    @Override
+    public boolean installBackupAgent(final Long zoneId) { return true; }
+
+    @Override
+    public boolean importBackupPlan(final Long zoneId, final String retentionPeriod, final String externalId) { return true; }
+
+    @Override
+    public boolean updateBackupPlan(final Long zoneId, final String retentionPeriod, final String externalId) { return true; }
+
+}
diff --git a/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties
new file mode 100644
index 000000000000..9079d19e8522
--- /dev/null
+++ b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+name=ablestack-nas
+parent=backup
diff --git a/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml
new file mode 100644
index 000000000000..ecb71f96d19b
--- /dev/null
+++ b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml
@@ -0,0 +1,26 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements. See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership. The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License. You may obtain a copy of the License at
+  http://www.apache.org/licenses/LICENSE-2.0
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://www.springframework.org/schema/beans"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+                      http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"
+>
+
+    <bean id="ablestackNasBackupProvider" class="org.apache.cloudstack.backup.AblestackNasBackupProvider">
+        <property name="name" value="ablestack-nas"/>
+    </bean>
+</beans>
diff --git a/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java b/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java
new file mode 100644
index 000000000000..229a6f8e7f05
--- /dev/null
+++ b/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java
@@ -0,0 +1,357 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.cloud.vm.snapshot.dao.VMSnapshotDao;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.agent.AgentManager;
+import com.cloud.exception.AgentUnavailableException;
+import com.cloud.exception.OperationTimedoutException;
+import com.cloud.host.Host;
+import com.cloud.host.HostVO;
+import com.cloud.host.Status;
+import com.cloud.host.dao.HostDao;
+import com.cloud.hypervisor.Hypervisor;
+import com.cloud.resource.ResourceManager;
+import com.cloud.storage.Volume;
+import com.cloud.storage.VolumeVO;
+import com.cloud.storage.dao.VolumeDao;
+import com.cloud.utils.Pair;
+import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.dao.VMInstanceDao;
+
+import org.apache.cloudstack.backup.dao.BackupDao;
+import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
+import org.apache.cloudstack.backup.dao.BackupOfferingDao;
+import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
+import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+
+@RunWith(MockitoJUnitRunner.class)
+public class AblestackNasBackupProviderTest {
+    @Spy
+    @InjectMocks
+    private AblestackNasBackupProvider ablestackNasBackupProvider;
+
+    @Mock
+    private BackupDao backupDao;
+
+    @Mock
+    private BackupRepositoryDao backupRepositoryDao;
+
+    @Mock
+    private BackupOfferingDao backupOfferingDao;
+
+    @Mock
+    private VMInstanceDao vmInstanceDao;
+
+    @Mock
+    private AgentManager agentManager;
+
+    @Mock
+    private VolumeDao volumeDao;
+
+    @Mock
+    private HostDao hostDao;
+
+    @Mock
+    private BackupManager backupManager;
+
+    @Mock
+    private ResourceManager resourceManager;
+
+    @Mock
+    private PrimaryDataStoreDao storagePoolDao;
+
+    @Mock
+    private VMSnapshotDao vmSnapshotDaoMock;
+
+    @Test
+    public void testDeleteBackup() throws OperationTimedoutException, AgentUnavailableException {
+        Long hostId = 1L;
+        BackupVO backup = new BackupVO();
+        backup.setBackupOfferingId(1L);
+        backup.setVmId(1L);
+        backup.setExternalId("externalId");
+        ReflectionTestUtils.setField(backup, "id", 1L);
+
+        BackupRepositoryVO backupRepository = new BackupRepositoryVO(1L, "nas", "test-repo",
+                "nfs", "address", "sync", 1024L, null);
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        Mockito.when(vm.getLastHostId()).thenReturn(hostId);
+        HostVO host = mock(HostVO.class);
+        Mockito.when(host.getStatus()).thenReturn(Status.Up);
+        Mockito.when(hostDao.findById(hostId)).thenReturn(host);
+        Mockito.when(backupRepositoryDao.findByBackupOfferingId(1L)).thenReturn(backupRepository);
+        Mockito.when(vmInstanceDao.findByIdIncludingRemoved(1L)).thenReturn(vm);
+        Mockito.when(agentManager.send(anyLong(), Mockito.any(AblestackDeleteBackupCommand.class))).thenReturn(new BackupAnswer(new DeleteBackupCommand(null, null, null, null, true), true, "details"));
+        Mockito.when(backupDao.remove(1L)).thenReturn(true);
+
+        boolean result = ablestackNasBackupProvider.deleteBackup(backup, true);
+        Assert.assertTrue(result);
+        Mockito.verify(agentManager).send(anyLong(), Mockito.<AblestackDeleteBackupCommand>argThat(AblestackDeleteBackupCommand::isForced));
+    }
+
+    @Test
+    public void testSyncBackupStorageStats() throws AgentUnavailableException, OperationTimedoutException {
+        BackupRepositoryVO backupRepository = new BackupRepositoryVO(1L, "nas", "test-repo",
+                "nfs", "address", "sync", 1024L, null);
+
+        HostVO host = mock(HostVO.class);
+        Mockito.when(resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, 1L)).thenReturn(host);
+
+        Mockito.when(backupRepositoryDao.listByZoneAndProvider(1L, "nas")).thenReturn(Collections.singletonList(backupRepository));
+        GetBackupStorageStatsCommand command = new GetBackupStorageStatsCommand("nfs", "address", "sync");
+        BackupStorageStatsAnswer answer = new BackupStorageStatsAnswer(command, true, null);
+        answer.setTotalSize(100L);
+        answer.setUsedSize(50L);
+        Mockito.when(agentManager.send(anyLong(), Mockito.any(GetBackupStorageStatsCommand.class))).thenReturn(answer);
+
+        nasBackupProvider.syncBackupStorageStats(1L);
+        Mockito.verify(backupRepositoryDao, Mockito.times(1)).updateCapacity(backupRepository, 100L, 50L);
+    }
+
+    @Test
+    public void testListBackupOfferings() {
+        BackupRepositoryVO backupRepository = new BackupRepositoryVO(1L, "nas", "test-repo",
+                "nfs", "address", "sync", 1024L, null);
+        ReflectionTestUtils.setField(backupRepository, "uuid", "uuid");
+
+        Mockito.when(backupRepositoryDao.listByZoneAndProvider(1L, "nas")).thenReturn(Collections.singletonList(backupRepository));
+
+        List<BackupOffering> result = nasBackupProvider.listBackupOfferings(1L);
+        Assert.assertEquals(1, result.size());
+        Assert.assertEquals("test-repo", result.get(0).getName());
+        Assert.assertEquals("uuid", result.get(0).getUuid());
+    }
+
+    @Test
+    public void testGetBackupStorageStats() {
+        BackupRepositoryVO backupRepository1 = new BackupRepositoryVO(1L, "nas", "test-repo",
+                "nfs", "address", "sync", 1000L, null);
+        backupRepository1.setUsedBytes(500L);
+
+        BackupRepositoryVO backupRepository2 = new BackupRepositoryVO(1L, "nas", "test-repo",
+                "nfs", "address", "sync", 2000L, null);
+        backupRepository2.setUsedBytes(600L);
+
+        Mockito.when(backupRepositoryDao.listByZoneAndProvider(1L, "nas"))
+                .thenReturn(List.of(backupRepository1, backupRepository2));
+
+        Pair<Long, Long> result = nasBackupProvider.getBackupStorageStats(1L);
+        Assert.assertEquals(Long.valueOf(1100L), result.first());
+        Assert.assertEquals(Long.valueOf(3000L), result.second());
+    }
+
+    @Test
+    public void takeBackupSuccessfully() throws AgentUnavailableException, OperationTimedoutException {
+        Long vmId = 1L;
+        Long hostId = 2L;
+        Long backupOfferingId = 3L;
+        Long accountId = 4L;
+        Long domainId = 5L;
+        Long zoneId = 6L;
+        Long backupId = 7L;
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        Mockito.when(vm.getId()).thenReturn(vmId);
+        Mockito.when(vm.getHostId()).thenReturn(hostId);
+        Mockito.when(vm.getInstanceName()).thenReturn("test-vm");
+        Mockito.when(vm.getBackupOfferingId()).thenReturn(backupOfferingId);
+        Mockito.when(vm.getAccountId()).thenReturn(accountId);
+        Mockito.when(vm.getDomainId()).thenReturn(domainId);
+        Mockito.when(vm.getDataCenterId()).thenReturn(zoneId);
+        Mockito.when(vm.getState()).thenReturn(VMInstanceVO.State.Running);
+
+        BackupRepository backupRepository = mock(BackupRepository.class);
+        Mockito.when(backupRepository.getType()).thenReturn("nfs");
+        Mockito.when(backupRepository.getAddress()).thenReturn("address");
+        Mockito.when(backupRepository.getMountOptions()).thenReturn("sync");
+        Mockito.when(backupRepositoryDao.findByBackupOfferingId(backupOfferingId)).thenReturn(backupRepository);
+
+        HostVO host = mock(HostVO.class);
+        Mockito.when(host.getId()).thenReturn(hostId);
+        Mockito.when(host.getStatus()).thenReturn(Status.Up);
+        Mockito.when(host.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.KVM);
+        Mockito.when(hostDao.findById(hostId)).thenReturn(host);
+
+        VolumeVO volume1 = mock(VolumeVO.class);
+        Mockito.when(volume1.getState()).thenReturn(Volume.State.Ready);
+        Mockito.when(volume1.getSize()).thenReturn(100L);
+        VolumeVO volume2 = mock(VolumeVO.class);
+        Mockito.when(volume2.getState()).thenReturn(Volume.State.Ready);
+        Mockito.when(volume2.getSize()).thenReturn(200L);
+        Mockito.when(volumeDao.findByInstance(vmId)).thenReturn(List.of(volume1, volume2));
+
+        BackupAnswer answer = mock(BackupAnswer.class);
+        Mockito.when(answer.getResult()).thenReturn(true);
+        Mockito.when(answer.getSize()).thenReturn(100L);
+        Mockito.when(agentManager.send(anyLong(), Mockito.any(AblestackNasTakeBackupCommand.class))).thenReturn(answer);
+
+        Mockito.when(backupDao.persist(Mockito.any(BackupVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
+        Mockito.when(backupDao.update(Mockito.anyLong(), Mockito.any(BackupVO.class))).thenReturn(true);
+
+        Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, false);
+
+        Assert.assertTrue(result.first());
+        Assert.assertNotNull(result.second());
+        BackupVO backup = (BackupVO) result.second();
+        Assert.assertEquals(Optional.ofNullable(100L), Optional.ofNullable(backup.getSize()));
+        Assert.assertEquals(Backup.Status.BackedUp, backup.getStatus());
+        Assert.assertEquals("FULL", backup.getType());
+        Assert.assertEquals(Optional.of(300L), Optional.of(backup.getProtectedSize()));
+        Assert.assertEquals(Optional.of(backupOfferingId), Optional.of(backup.getBackupOfferingId()));
+        Assert.assertEquals(Optional.of(accountId), Optional.of(backup.getAccountId()));
+        Assert.assertEquals(Optional.of(domainId), Optional.of(backup.getDomainId()));
+        Assert.assertEquals(Optional.of(zoneId), Optional.of(backup.getZoneId()));
+
+        Mockito.verify(backupDao).persist(Mockito.any(BackupVO.class));
+        Mockito.verify(backupDao).update(Mockito.anyLong(), Mockito.any(BackupVO.class));
+        Mockito.verify(agentManager).send(anyLong(), Mockito.any(AblestackNasTakeBackupCommand.class));
+    }
+
+    @Test
+    public void testGetVMHypervisorHost() {
+        Long hostId = 1L;
+        Long vmId = 1L;
+        Long zoneId = 1L;
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        Mockito.when(vm.getLastHostId()).thenReturn(hostId);
+
+        HostVO host = mock(HostVO.class);
+        Mockito.when(host.getId()).thenReturn(hostId);
+        Mockito.when(host.getStatus()).thenReturn(Status.Up);
+        Mockito.when(hostDao.findById(hostId)).thenReturn(host);
+
+        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+
+        Assert.assertNotNull(result);
+        Assert.assertTrue(Objects.equals(hostId, result.getId()));
+        Mockito.verify(hostDao).findById(hostId);
+    }
+
+    @Test
+    public void testGetVMHypervisorHostWithHostDown() {
+        Long hostId = 1L;
+        Long clusterId = 2L;
+        Long vmId = 1L;
+        Long zoneId = 1L;
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        Mockito.when(vm.getLastHostId()).thenReturn(hostId);
+
+        HostVO downHost = mock(HostVO.class);
+        Mockito.when(downHost.getStatus()).thenReturn(Status.Down);
+        Mockito.when(downHost.getClusterId()).thenReturn(clusterId);
+        Mockito.when(hostDao.findById(hostId)).thenReturn(downHost);
+
+        HostVO upHostInCluster = mock(HostVO.class);
+        Mockito.when(upHostInCluster.getId()).thenReturn(3L);
+        Mockito.when(upHostInCluster.getStatus()).thenReturn(Status.Up);
+        Mockito.when(hostDao.findHypervisorHostInCluster(clusterId)).thenReturn(List.of(upHostInCluster));
+
+        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+
+        Assert.assertNotNull(result);
+        Assert.assertTrue(Objects.equals(Long.valueOf(3L), result.getId()));
+        Mockito.verify(hostDao).findById(hostId);
+        Mockito.verify(hostDao).findHypervisorHostInCluster(clusterId);
+    }
+
+    @Test
+    public void testGetVMHypervisorHostWithUpHostViaRootVolumeCluster() {
+        Long vmId = 1L;
+        Long zoneId = 1L;
+        Long clusterId = 2L;
+        Long poolId = 3L;
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        Mockito.when(vm.getLastHostId()).thenReturn(null);
+        Mockito.when(vm.getId()).thenReturn(vmId);
+
+        VolumeVO rootVolume = mock(VolumeVO.class);
+        Mockito.when(rootVolume.getPoolId()).thenReturn(poolId);
+        Mockito.when(volumeDao.getInstanceRootVolume(vmId)).thenReturn(rootVolume);
+
+        StoragePoolVO storagePool = mock(StoragePoolVO.class);
+        Mockito.when(storagePool.getClusterId()).thenReturn(clusterId);
+        Mockito.when(storagePoolDao.findById(poolId)).thenReturn(storagePool);
+
+        HostVO upHostInCluster = mock(HostVO.class);
+        Mockito.when(upHostInCluster.getId()).thenReturn(4L);
+        Mockito.when(upHostInCluster.getStatus()).thenReturn(Status.Up);
+        Mockito.when(hostDao.findHypervisorHostInCluster(clusterId)).thenReturn(List.of(upHostInCluster));
+
+        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+
+        Assert.assertNotNull(result);
+        Assert.assertTrue(Objects.equals(Long.valueOf(4L), result.getId()));
+        Mockito.verify(volumeDao).getInstanceRootVolume(vmId);
+        Mockito.verify(storagePoolDao).findById(poolId);
+        Mockito.verify(hostDao).findHypervisorHostInCluster(clusterId);
+    }
+
+    @Test
+    public void testGetVMHypervisorHostFallbackToZoneWideKVMHost() {
+        Long hostId = 1L;
+        Long clusterId = 2L;
+        Long vmId = 1L;
+        Long zoneId = 1L;
+
+        VMInstanceVO vm = mock(VMInstanceVO.class);
+        Mockito.when(vm.getLastHostId()).thenReturn(hostId);
+        Mockito.when(vm.getDataCenterId()).thenReturn(zoneId);
+
+        HostVO downHost = mock(HostVO.class);
+        Mockito.when(downHost.getStatus()).thenReturn(Status.Down);
+        Mockito.when(downHost.getClusterId()).thenReturn(clusterId);
+        Mockito.when(hostDao.findById(hostId)).thenReturn(downHost);
+
+        Mockito.when(hostDao.findHypervisorHostInCluster(clusterId)).thenReturn(Collections.emptyList());
+
+        HostVO fallbackHost = mock(HostVO.class);
+        Mockito.when(fallbackHost.getId()).thenReturn(5L);
+        Mockito.when(resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, zoneId))
+                .thenReturn(fallbackHost);
+
+        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+
+        Assert.assertNotNull(result);
+        Assert.assertTrue(Objects.equals(Long.valueOf(5L), result.getId()));
+        Mockito.verify(hostDao).findById(hostId);
+        Mockito.verify(hostDao).findHypervisorHostInCluster(clusterId);
+        Mockito.verify(resourceManager).findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, zoneId);
+    }
+}
diff --git a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
index a1df322ef2ad..4e1455aa4b9d 100644
--- a/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
+++ b/plugins/backup/nas/src/main/java/org/apache/cloudstack/backup/NASBackupProvider.java
@@ -59,14 +59,12 @@
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
 
 import javax.inject.Inject;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -77,25 +75,10 @@
 import java.util.UUID;
 import java.util.stream.Collectors;
 
-import static org.apache.cloudstack.backup.BackupManager.BackupDeltaMax;
 import static org.apache.cloudstack.backup.BackupManager.BackupFrameworkEnabled;
-import static org.apache.cloudstack.backup.BackupManager.KvmIncrementalBackup;
 
 public class NASBackupProvider extends AdapterBase implements BackupProvider, Configurable {
     private static final Logger LOG = LogManager.getLogger(NASBackupProvider.class);
-    private static final String BACKUP_TYPE_FULL = "FULL";
-    private static final String BACKUP_TYPE_INCREMENTAL = "INCREMENTAL";
-    private static final String BACKUP_ENGINE_QCOW2 = "QCOW2";
-    private static final String BACKUP_ENGINE_RBD_DIFF = "RBD_DIFF";
-    private static final String DETAIL_CHECKPOINT_NAME = "nas.checkpoint.name";
-    private static final String DETAIL_CHECKPOINT_PATH = "nas.checkpoint.path";
-    private static final String DETAIL_PARENT_BACKUP_UUID = "nas.parent.backup.uuid";
-    private static final String DETAIL_PARENT_BACKUP_PATH = "nas.parent.backup.path";
-    private static final String DETAIL_PARENT_CHECKPOINT_NAME = "nas.parent.checkpoint.name";
-    private static final String DETAIL_PARENT_CHECKPOINT_PATH = "nas.parent.checkpoint.path";
-    private static final String DETAIL_BACKUP_ENGINE = "nas.backup.engine";
-    private static final String DETAIL_RBD_DISK_PATHS = "nas.rbd.disk.paths";
-    private static final String MISSING_PARENT_RBD_SNAPSHOT_ERROR = "Parent RBD snapshot";
 
     ConfigKey<Integer> NASBackupRestoreMountTimeout = new ConfigKey<>("Advanced", Integer.class,
             "nas.backup.restore.mount.timeout",
@@ -104,13 +87,6 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co
             true,
             BackupFrameworkEnabled.key());
 
-    ConfigKey<Integer> NASBackupRestoreTimeout = new ConfigKey<>("Advanced", Integer.class,
-            "nas.backup.restore.timeout",
-            "1800",
-            "Timeout in seconds after which NAS backup restore operations fail.",
-            true,
-            BackupFrameworkEnabled.key());
-
     @Inject
     private BackupDao backupDao;
 
@@ -221,49 +197,31 @@ public Pair<Boolean, Backup> takeBackup(final VirtualMachine vm, Boolean quiesce
             throw new CloudRuntimeException("No valid backup repository found for the VM, please check the attached backup offering");
         }
 
-        validateNoVmSnapshots(vm);
-        List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
-        vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
-        Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
-        validateVolumePoolTypes(volumePoolsAndPaths.first());
-        final BackupVO latestBackup = getLatestBackedUpBackup(vm);
-        final boolean incrementalBackup = shouldUseIncrementalBackup(vm, latestBackup);
-        BackupExecutionResult result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, latestBackup, incrementalBackup,
-                incrementalBackup && vmVolumes.size() > 1);
-        if (!result.success && incrementalBackup && shouldRetryAsFullAfterIncrementalFailure(result, vmVolumes)) {
-            cleanupFailedBackupForFullRetry(result.backup);
-            LOG.warn("Incremental backup failed for VM [{}] due to [{}]. Retrying as full backup.", vm, result.details);
-            result = executeBackup(vm, quiesceVM, host, backupRepository, vmVolumes, volumePoolsAndPaths, null, false, false);
+        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVmAndByType(vm.getId(), VMSnapshot.Type.DiskAndMemory))) {
+            logger.debug("NAS backup provider cannot take backups of a VM [{}] with disk-and-memory VM snapshots. Restoring the backup will corrupt any newer disk-and-memory " +
+                    "VM snapshots.", vm);
+            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has disk-and-memory VM snapshots.", vm.getUuid()));
         }
-        return new Pair<>(result.success, result.backup);
-    }
 
-    private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM, Host host, BackupRepository backupRepository,
-                                                List<VolumeVO> vmVolumes, Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths,
-                                                Backup parentBackup, boolean incrementalBackup, boolean retryAsFullOnFailure) {
-        final String backupPath = buildBackupPath(vm);
-        final String checkpointName = backupPath.substring(backupPath.lastIndexOf("/") + 1);
-        final String backupEngine = areAllVolumesOnRbdPool(volumePoolsAndPaths.first()) ? BACKUP_ENGINE_RBD_DIFF : BACKUP_ENGINE_QCOW2;
-        final List<String> backupFiles = buildBackupFileNames(vmVolumes, backupEngine, incrementalBackup);
+        final Date creationDate = new Date();
+        final String backupPath = String.format("%s/%s", vm.getInstanceName(),
+                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss").format(creationDate));
 
-        BackupVO backupVO = createBackupObject(vm, backupPath, incrementalBackup ? BACKUP_TYPE_INCREMENTAL : BACKUP_TYPE_FULL,
-                checkpointName, backupEngine, incrementalBackup ? parentBackup : null, volumePoolsAndPaths.second());
+        BackupVO backupVO = createBackupObject(vm, backupPath);
         TakeBackupCommand command = new TakeBackupCommand(vm.getInstanceName(), backupPath);
-        command.setBackupType(backupVO.getType());
-        command.setCheckpointName(checkpointName);
-        command.setBackupFiles(backupFiles);
-        command.setVolumePools(volumePoolsAndPaths.first());
-        command.setVolumePaths(volumePoolsAndPaths.second());
-        if (incrementalBackup && parentBackup != null) {
-            command.setParentBackupPath(parentBackup.getExternalId());
-            command.setParentCheckpointName(getBackupDetail(parentBackup, DETAIL_CHECKPOINT_NAME));
-            command.setParentCheckpointPath(getBackupDetail(parentBackup, DETAIL_CHECKPOINT_PATH));
-        }
         command.setBackupRepoType(backupRepository.getType());
         command.setBackupRepoAddress(backupRepository.getAddress());
         command.setMountOptions(backupRepository.getMountOptions());
         command.setQuiesce(quiesceVM);
 
+        if (VirtualMachine.State.Stopped.equals(vm.getState())) {
+            List<VolumeVO> vmVolumes = volumeDao.findByInstance(vm.getId());
+            vmVolumes.sort(Comparator.comparing(Volume::getDeviceId));
+            Pair<List<PrimaryDataStoreTO>, List<String>> volumePoolsAndPaths = getVolumePoolsAndPaths(vmVolumes);
+            command.setVolumePools(volumePoolsAndPaths.first());
+            command.setVolumePaths(volumePoolsAndPaths.second());
+        }
+
         BackupAnswer answer;
         try {
             answer = (BackupAnswer) agentManager.send(host.getId(), command);
@@ -283,84 +241,32 @@ private BackupExecutionResult executeBackup(VirtualMachine vm, Boolean quiesceVM
             backupVO.setDate(new Date());
             backupVO.setSize(answer.getSize());
             backupVO.setStatus(Backup.Status.BackedUp);
-            backupVO.setBackedUpVolumes(createVolumeInfoFromVolumes(vmVolumes, backupFiles));
+            List<Volume> volumes = new ArrayList<>(volumeDao.findByInstance(vm.getId()));
+            backupVO.setBackedUpVolumes(backupManager.createVolumeInfoFromVolumes(volumes));
             if (backupDao.update(backupVO.getId(), backupVO)) {
-                return BackupExecutionResult.success(backupVO);
+                return new Pair<>(true, backupVO);
+            } else {
+                throw new CloudRuntimeException("Failed to update backup");
             }
-            throw new CloudRuntimeException("Failed to update backup");
-        }
-
-        final String details = answer != null ? answer.getDetails() : "No answer received";
-        logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), details);
-        if (retryAsFullOnFailure) {
-            backupVO.setStatus(Backup.Status.Failed);
-            backupDao.remove(backupVO.getId());
-        } else if (answer != null && answer.getNeedsCleanup()) {
-            logger.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
-            backupVO.setStatus(Backup.Status.Error);
-            backupDao.update(backupVO.getId(), backupVO);
         } else {
-            backupVO.setStatus(Backup.Status.Failed);
-            backupDao.remove(backupVO.getId());
-        }
-        return BackupExecutionResult.failure(details, backupVO);
-    }
-
-    private boolean shouldRetryAsFullAfterIncrementalFailure(BackupExecutionResult result, List<VolumeVO> vmVolumes) {
-        if (result == null || result.success) {
-            return false;
-        }
-        if (StringUtils.contains(result.details, MISSING_PARENT_RBD_SNAPSHOT_ERROR)) {
-            return true;
-        }
-        return vmVolumes.size() > 1;
-    }
-
-    private void cleanupFailedBackupForFullRetry(Backup backup) {
-        if (backup == null) {
-            return;
-        }
-        backupDao.remove(backup.getId());
-    }
-
-    private static final class BackupExecutionResult {
-        private final boolean success;
-        private final Backup backup;
-        private final String details;
-
-        private BackupExecutionResult(boolean success, Backup backup, String details) {
-            this.success = success;
-            this.backup = backup;
-            this.details = details;
-        }
-
-        private static BackupExecutionResult success(Backup backup) {
-            return new BackupExecutionResult(true, backup, null);
-        }
-
-        private static BackupExecutionResult failure(String details, Backup backup) {
-            return new BackupExecutionResult(false, backup, details);
-        }
-    }
-
-    private String buildBackupPath(VirtualMachine vm) {
-        return String.format("%s/%s", vm.getInstanceName(),
-                new SimpleDateFormat("yyyy.MM.dd.HH.mm.ss.SSS").format(new Date()));
-    }
-
-    private void validateNoVmSnapshots(VirtualMachine vm) {
-        if (CollectionUtils.isNotEmpty(vmSnapshotDao.findByVm(vm.getId()))) {
-            logger.debug("NAS backup provider cannot take backups of a VM [{}] with VM snapshots.", vm);
-            throw new CloudRuntimeException(String.format("Cannot take backup of VM [%s] as it has VM snapshots.", vm.getUuid()));
+            logger.error("Failed to take backup for VM {}: {}", vm.getInstanceName(), answer != null ? answer.getDetails() : "No answer received");
+            if (answer.getNeedsCleanup()) {
+                logger.error("Backup cleanup failed for VM {}. Leaving the backup in Error state.", vm.getInstanceName());
+                backupVO.setStatus(Backup.Status.Error);
+                backupDao.update(backupVO.getId(), backupVO);
+            } else {
+                backupVO.setStatus(Backup.Status.Failed);
+                backupDao.remove(backupVO.getId());
+            }
+            return new Pair<>(false, null);
         }
     }
 
-    private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String backupType, String checkpointName, String backupEngine, Backup parentBackup,
-                                        List<String> diskPaths) {
+    private BackupVO createBackupObject(VirtualMachine vm, String backupPath) {
         BackupVO backup = new BackupVO();
         backup.setVmId(vm.getId());
         backup.setExternalId(backupPath);
-        backup.setType(backupType);
+        backup.setType("FULL");
         backup.setDate(new Date());
         long virtualSize = 0L;
         for (final Volume volume: volumeDao.findByInstance(vm.getId())) {
@@ -375,142 +281,12 @@ private BackupVO createBackupObject(VirtualMachine vm, String backupPath, String
         backup.setDomainId(vm.getDomainId());
         backup.setZoneId(vm.getDataCenterId());
         backup.setName(backupManager.getBackupNameFromVM(vm));
-        Map<String, String> details = new HashMap<>();
-        Map<String, String> backupDetails = backupManager.getBackupDetailsFromVM(vm);
-        if (backupDetails != null) {
-            details.putAll(backupDetails);
-        }
-        details.put(DETAIL_CHECKPOINT_NAME, checkpointName);
-        details.put(DETAIL_CHECKPOINT_PATH, getCheckpointPath(backupPath, checkpointName, backupEngine));
-        details.put(DETAIL_BACKUP_ENGINE, backupEngine);
-        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine) && CollectionUtils.isNotEmpty(diskPaths)) {
-            details.put(DETAIL_RBD_DISK_PATHS, String.join(",", diskPaths));
-        }
-        if (parentBackup != null) {
-            details.put(DETAIL_PARENT_BACKUP_UUID, parentBackup.getUuid());
-            details.put(DETAIL_PARENT_BACKUP_PATH, parentBackup.getExternalId());
-            details.put(DETAIL_PARENT_CHECKPOINT_NAME, getBackupDetail(parentBackup, DETAIL_CHECKPOINT_NAME));
-            details.put(DETAIL_PARENT_CHECKPOINT_PATH, getBackupDetail(parentBackup, DETAIL_CHECKPOINT_PATH));
-        }
+        Map<String, String> details = backupManager.getBackupDetailsFromVM(vm);
         backup.setDetails(details);
 
         return backupDao.persist(backup);
     }
 
-    private String getCheckpointPath(String backupPath, String checkpointName, String backupEngine) {
-        if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
-            return String.format("%s/checkpoints/%s.meta", backupPath, checkpointName);
-        }
-        return String.format("%s/checkpoints/%s.xml", backupPath, checkpointName);
-    }
-
-    private BackupVO getLatestBackedUpBackup(VirtualMachine vm) {
-        List<Backup> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId());
-        return backups.stream()
-                .filter(BackupVO.class::isInstance)
-                .map(BackupVO.class::cast)
-                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
-                .peek(backupDao::loadDetails)
-                .filter(backup -> getBackupDetail(backup, DETAIL_CHECKPOINT_NAME) != null)
-                .max(Comparator.comparing(BackupVO::getDate))
-                .orElse(null);
-    }
-
-    private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBackup) {
-        if (latestBackup == null) {
-            return false;
-        }
-
-        final Long clusterId = getClusterIdFromRootVolume(vm);
-        if (clusterId == null) {
-            LOG.debug("Unable to resolve cluster for VM [{}], fallback to full backup.", vm);
-            return false;
-        }
-
-        if (!KvmIncrementalBackup.valueIn(clusterId)) {
-            return false;
-        }
-
-        return getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
-    }
-
-    private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {
-        List<BackupVO> backups = backupDao.listByVmIdAndOffering(vm.getDataCenterId(), vm.getId(), vm.getBackupOfferingId()).stream()
-                .filter(BackupVO.class::isInstance)
-                .map(BackupVO.class::cast)
-                .filter(backup -> Backup.Status.BackedUp.equals(backup.getStatus()))
-                .peek(backupDao::loadDetails)
-                .collect(Collectors.toList());
-        Map<String, BackupVO> backupsByUuid = backups.stream().collect(Collectors.toMap(BackupVO::getUuid, backup -> backup, (left, right) -> left));
-        int chainSize = 1;
-        Backup current = latestBackup;
-        while (current != null) {
-            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
-            if (parentBackupUuid == null) {
-                break;
-            }
-            current = backupsByUuid.get(parentBackupUuid);
-            if (current != null) {
-                chainSize++;
-            }
-        }
-        return chainSize;
-    }
-
-    private boolean hasDependentBackups(Backup backup) {
-        List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
-        return backups.stream()
-                .filter(BackupVO.class::isInstance)
-                .map(BackupVO.class::cast)
-                .filter(candidate -> !Objects.equals(candidate.getId(), backup.getId()))
-                .peek(backupDao::loadDetails)
-                .anyMatch(candidate -> Objects.equals(getBackupDetail(candidate, DETAIL_PARENT_BACKUP_UUID), backup.getUuid()));
-    }
-
-    private String getBackupDetail(Backup backup, String key) {
-        Map<String, String> details = backup.getDetails();
-        return details != null ? details.get(key) : null;
-    }
-
-    private void validateVolumePoolTypes(List<PrimaryDataStoreTO> volumePools) {
-        boolean hasRbd = volumePools.stream().anyMatch(pool -> pool != null && Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
-        boolean hasNonRbd = volumePools.stream().anyMatch(pool -> pool != null && !Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
-        if (hasRbd && hasNonRbd) {
-            throw new CloudRuntimeException("NAS incremental backup does not support VMs with mixed RBD and non-RBD volumes");
-        }
-    }
-
-    private boolean areAllVolumesOnRbdPool(List<PrimaryDataStoreTO> volumePools) {
-        return CollectionUtils.isNotEmpty(volumePools) &&
-                volumePools.stream().allMatch(pool -> pool != null && Storage.StoragePoolType.RBD.equals(pool.getPoolType()));
-    }
-
-    private List<String> buildBackupFileNames(List<VolumeVO> volumes, String backupEngine, boolean incrementalBackup) {
-        List<String> backupFiles = new ArrayList<>();
-        for (VolumeVO volume : volumes) {
-            String suffix;
-            if (BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
-                suffix = incrementalBackup ? ".rbdiff" : ".raw";
-            } else {
-                suffix = ".qcow2";
-            }
-            backupFiles.add(String.format("volume-%s%s", volume.getUuid(), suffix));
-        }
-        return backupFiles;
-    }
-
-    private String createVolumeInfoFromVolumes(List<VolumeVO> volumes, List<String> backupFiles) {
-        List<Backup.VolumeInfo> infoList = new ArrayList<>();
-        for (int i = 0; i < volumes.size(); i++) {
-            VolumeVO vol = volumes.get(i);
-            DiskOffering diskOffering = diskOfferingDao.findById(vol.getDiskOfferingId());
-            String diskOfferingUuid = diskOffering != null ? diskOffering.getUuid() : null;
-            infoList.add(new Backup.VolumeInfo(vol.getUuid(), backupFiles.get(i), vol.getVolumeType(), vol.getSize(),
-                    vol.getDeviceId(), diskOfferingUuid, vol.getMinIops(), vol.getMaxIops()));
-        }
-        return new com.google.gson.Gson().toJson(infoList.toArray(), Backup.VolumeInfo[].class);
-    }
-
     @Override
     public Pair<Boolean, String> restoreBackupToVM(VirtualMachine vm, Backup backup, String hostIp, String dataStoreUuid) {
         return restoreVMBackup(vm, backup);
@@ -522,8 +298,7 @@ public boolean restoreVMFromBackup(VirtualMachine vm, Backup backup) {
     }
 
     private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup) {
-        List<Backup.VolumeInfo> backupVolumes = backup.getBackedUpVolumes();
-        List<String> backedVolumesUUIDs = backupVolumes.stream()
+        List<String> backedVolumesUUIDs = backup.getBackedUpVolumes().stream()
                 .sorted(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId))
                 .map(Backup.VolumeInfo::getUuid)
                 .collect(Collectors.toList());
@@ -547,12 +322,10 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         restoreCommand.setRestoreVolumePools(volumePoolsAndPaths.first());
         restoreCommand.setRestoreVolumePaths(volumePoolsAndPaths.second());
         restoreCommand.setVolumePaths(getVolumePaths(restoreVolumes));
-        restoreCommand.setBackupFiles(getBackupFiles(backupVolumes, backup));
-        restoreCommand.setBackupFileChains(getBackupFileChains(backupVolumes, backup));
+        restoreCommand.setBackupFiles(getBackupFiles(vm.getBackupVolumeList()));
         restoreCommand.setVmExists(vm.getRemoved() == null);
         restoreCommand.setVmState(vm.getState());
         restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
-        restoreCommand.setWait(NASBackupRestoreTimeout.value());
 
         BackupAnswer answer;
         try {
@@ -565,126 +338,14 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         return new Pair<>(answer.getResult(), answer.getDetails());
     }
 
-    private List<String> getBackupFiles(List<Backup.VolumeInfo> backedVolumes, Backup backup) {
+    private List<String> getBackupFiles(List<Backup.VolumeInfo> backedVolumes) {
         List<String> backupFiles = new ArrayList<>();
-        List<Backup.VolumeInfo> sortedVolumes = new ArrayList<>(backedVolumes);
-        sortedVolumes.sort(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId));
-        for (Backup.VolumeInfo backedVolume : sortedVolumes) {
-            if (isLegacyBackup(backup)) {
-                backupFiles.add(getLegacyBackupFileName(backedVolume));
-            } else {
-                backupFiles.add(backedVolume.getPath());
-            }
+        for (Backup.VolumeInfo backedVolume : backedVolumes) {
+            backupFiles.add(backedVolume.getPath());
         }
         return backupFiles;
     }
 
-    private List<String> getBackupFileChains(List<Backup.VolumeInfo> backedVolumes, Backup backup) {
-        List<String> backupFileChains = new ArrayList<>();
-        List<Backup.VolumeInfo> sortedVolumes = new ArrayList<>(backedVolumes);
-        sortedVolumes.sort(Comparator.comparingLong(Backup.VolumeInfo::getDeviceId));
-        for (Backup.VolumeInfo backedVolume : sortedVolumes) {
-            backupFileChains.add(String.join(";", getBackupFileChain(backedVolume.getUuid(), backup)));
-        }
-        return backupFileChains;
-    }
-
-    private List<String> getBackupFileChain(String volumeUuid, Backup backup) {
-        loadBackupDetailsIfNeeded(backup);
-        if (isLegacyBackup(backup)) {
-            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
-            return volumeInfo != null ? getLegacyBackupFileCandidates(volumeInfo) : List.of();
-        }
-
-        String backupEngine = getBackupDetail(backup, DETAIL_BACKUP_ENGINE);
-        if (!BACKUP_ENGINE_RBD_DIFF.equals(backupEngine)) {
-            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volumeUuid);
-            return volumeInfo != null ? List.of(volumeInfo.getPath()) : List.of();
-        }
-
-        List<Backup> chain = getBackupChain(backup);
-        List<String> files = new ArrayList<>();
-        for (Backup chainBackup : chain) {
-            Backup.VolumeInfo volumeInfo = getBackedUpVolumeInfo(chainBackup.getBackedUpVolumes(), volumeUuid);
-            if (volumeInfo != null) {
-                files.add(String.format("%s/%s", chainBackup.getExternalId(), volumeInfo.getPath()));
-            }
-        }
-        return files;
-    }
-
-    private List<Backup> getBackupChain(Backup backup) {
-        loadBackupDetailsIfNeeded(backup);
-        List<Backup> backups = backupDao.listByVmIdAndOffering(backup.getZoneId(), backup.getVmId(), backup.getBackupOfferingId());
-        Map<String, Backup> backupsByUuid = new HashMap<>();
-        for (Backup candidate : backups) {
-            if (candidate instanceof BackupVO) {
-                backupDao.loadDetails((BackupVO) candidate);
-            }
-            backupsByUuid.put(candidate.getUuid(), candidate);
-        }
-
-        List<Backup> chain = new ArrayList<>();
-        Backup current = backup;
-        while (current != null) {
-            chain.add(current);
-            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
-            current = parentBackupUuid != null ? backupsByUuid.get(parentBackupUuid) : null;
-        }
-        Collections.reverse(chain);
-        return chain;
-    }
-
-    private void loadBackupDetailsIfNeeded(Backup backup) {
-        if (backup instanceof BackupVO && backup.getDetails() == null) {
-            backupDao.loadDetails((BackupVO) backup);
-        }
-    }
-
-    private boolean isLegacyBackup(Backup backup) {
-        return getBackupDetail(backup, DETAIL_BACKUP_ENGINE) == null;
-    }
-
-    private String getLegacyBackupFileName(Backup.VolumeInfo volumeInfo) {
-        String volumePath = volumeInfo.getPath();
-        if (StringUtils.isNotBlank(volumePath) &&
-                (volumePath.endsWith(".qcow2") || volumePath.endsWith(".raw") || volumePath.endsWith(".rbdiff"))) {
-            return volumePath;
-        }
-        String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
-        return String.format("%s.%s.qcow2", diskPrefix, volumeInfo.getPath());
-    }
-
-    private List<String> getLegacyBackupFileCandidates(Backup.VolumeInfo volumeInfo) {
-        List<String> candidates = new ArrayList<>();
-        String volumePath = volumeInfo.getPath();
-        if (StringUtils.isNotBlank(volumePath)) {
-            candidates.add(volumePath);
-            if (volumePath.contains("/")) {
-                String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
-                if (!Objects.equals(volumePath, baseName)) {
-                    candidates.add(baseName);
-                }
-            }
-        }
-
-        String legacyFileName = getLegacyBackupFileName(volumeInfo);
-        if (!candidates.contains(legacyFileName)) {
-            candidates.add(legacyFileName);
-        }
-
-        if (volumePath != null && volumePath.contains("/")) {
-            String baseName = volumePath.substring(volumePath.lastIndexOf('/') + 1);
-            String diskPrefix = Volume.Type.ROOT.equals(volumeInfo.getType()) ? "root" : "datadisk";
-            String baseNameLegacyFile = String.format("%s.%s.qcow2", diskPrefix, baseName);
-            if (!candidates.contains(baseNameLegacyFile)) {
-                candidates.add(baseNameLegacyFile);
-            }
-        }
-
-        return candidates;
-    }
-
     private List<String> getVolumePaths(List<VolumeVO> volumes) {
         List<String> volumePaths = new ArrayList<>();
         for (VolumeVO volume : volumes) {
@@ -750,15 +411,8 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
                 cacheMode = baseDiskOffering.getCacheMode().toString();
             }
         }
-        StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
-        if (pool == null) {
-            List<StoragePoolVO> pools = primaryDataStoreDao.findPoolByName(dataStoreUuid);
-            pool = pools.get(0);
-        }
-        HostVO hostVO = hostDao.findByIp(hostIp);
-        if (hostVO == null) {
-            hostVO = hostDao.findByName(hostIp);
-        }
+        final StoragePoolVO pool = primaryDataStoreDao.findByUuid(dataStoreUuid);
+        final HostVO hostVO = hostDao.findByIp(hostIp);
 
         Backup.VolumeInfo matchingVolume = getBackedUpVolumeInfo(backup.getBackedUpVolumes(), volume.getUuid());
         if (matchingVolume == null) {
@@ -805,11 +459,9 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         restoreCommand.setVmExists(null);
         restoreCommand.setVmState(vmNameAndState.second());
         restoreCommand.setMountTimeout(NASBackupRestoreMountTimeout.value());
-        restoreCommand.setWait(NASBackupRestoreTimeout.value());
         restoreCommand.setCacheMode(cacheMode);
         restoreCommand.setVolumePaths(Collections.singletonList(String.format("%s/%s", pool.getPath(), volumeUUID)));
-        restoreCommand.setBackupFiles(getBackupFiles(Collections.singletonList(matchingVolume), backup));
-        restoreCommand.setBackupFileChains(Collections.singletonList(String.join(";", getBackupFileChain(matchingVolume.getUuid(), backup))));
+        restoreCommand.setBackupFiles(Collections.singletonList(matchingVolume.getPath()));
 
         BackupAnswer answer;
         try {
@@ -848,13 +500,6 @@ private Backup.VolumeInfo getBackedUpVolumeInfo(List<Backup.VolumeInfo> backedUp
 
     @Override
     public boolean deleteBackup(Backup backup, boolean forced) {
-        if (backup instanceof BackupVO && backup.getDetails() == null) {
-            backupDao.loadDetails((BackupVO) backup);
-        }
-        if (!forced && hasDependentBackups(backup)) {
-            throw new CloudRuntimeException(String.format("Backup [%s] cannot be deleted because one or more incremental backups depend on it.", backup.getUuid()));
-        }
-
         final BackupRepository backupRepository = backupRepositoryDao.findByBackupOfferingId(backup.getBackupOfferingId());
         if (backupRepository == null) {
             throw new CloudRuntimeException("No valid backup repository found for the VM, please check the attached backup offering");
@@ -869,10 +514,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
         }
 
         DeleteBackupCommand command = new DeleteBackupCommand(backup.getExternalId(), backupRepository.getType(),
-                backupRepository.getAddress(), backupRepository.getMountOptions(), forced);
-        command.setBackupProvider("nas");
-        command.setCheckpointName(getBackupDetail(backup, DETAIL_CHECKPOINT_NAME));
-        command.setDiskPaths(getBackupDetail(backup, DETAIL_RBD_DISK_PATHS));
+                backupRepository.getAddress(), backupRepository.getMountOptions());
 
         BackupAnswer answer;
         try {
@@ -884,7 +526,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
         }
 
         if (answer != null && answer.getResult()) {
-            return true;
+            return backupDao.remove(backup.getId());
         }
 
         logger.debug("There was an error removing the backup with id {}", backup.getId());
@@ -998,8 +640,7 @@ public Boolean crossZoneInstanceCreationEnabled(BackupOffering backupOffering) {
     @Override
     public ConfigKey<?>[] getConfigKeys() {
         return new ConfigKey[]{
-                NASBackupRestoreMountTimeout,
-                NASBackupRestoreTimeout
+                NASBackupRestoreMountTimeout
         };
     }
 
diff --git a/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java b/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
index c5814cdde901..a512292cd28f 100644
--- a/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
+++ b/plugins/backup/nas/src/test/java/org/apache/cloudstack/backup/NASBackupProviderTest.java
@@ -115,12 +115,11 @@ public void testDeleteBackup() throws OperationTimedoutException, AgentUnavailab
         Mockito.when(hostDao.findById(hostId)).thenReturn(host);
         Mockito.when(backupRepositoryDao.findByBackupOfferingId(1L)).thenReturn(backupRepository);
         Mockito.when(vmInstanceDao.findByIdIncludingRemoved(1L)).thenReturn(vm);
-        Mockito.when(agentManager.send(anyLong(), Mockito.any(DeleteBackupCommand.class))).thenReturn(new BackupAnswer(new DeleteBackupCommand(null, null, null, null, true), true, "details"));
+        Mockito.when(agentManager.send(anyLong(), Mockito.any(DeleteBackupCommand.class))).thenReturn(new BackupAnswer(new DeleteBackupCommand(null, null, null, null), true, "details"));
         Mockito.when(backupDao.remove(1L)).thenReturn(true);
 
         boolean result = nasBackupProvider.deleteBackup(backup, true);
         Assert.assertTrue(result);
-        Mockito.verify(agentManager).send(anyLong(), Mockito.<DeleteBackupCommand>argThat(DeleteBackupCommand::isForced));
     }
 
     @Test
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 6350e5d28550..be862a947232 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -426,7 +426,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
     private String vmActivityCheckPathRbd;
     private String vmActivityCheckPathClvm;
     private String nasBackupPath;
-    private String cvtBackupPath;
+    private String ableNasBackupPath;
+    private String ableCvtBackupPath;
     private String securityGroupPath;
     private String ovsPvlanDhcpHostPath;
     private String ovsPvlanVmPath;
@@ -857,8 +858,12 @@ public String getNasBackupPath() {
         return nasBackupPath;
     }
 
-    public String getCvtBackupPath() {
-        return cvtBackupPath;
+    public String getAbleNasBackupPath() {
+        return ableNasBackupPath;
+    }
+
+    public String getAbleCvtBackupPath() {
+        return ableCvtBackupPath;
     }
 
     public String getOvsPvlanDhcpHostPath() {
@@ -1198,9 +1203,14 @@ public boolean configure(final String name, final Map<String, Object> params) th
             throw new ConfigurationException("Unable to find nasbackup.sh");
         }
 
-        cvtBackupPath = Script.findScript(kvmScriptsDir, "cvtbackup.sh");
-        if (cvtBackupPath == null) {
-            throw new ConfigurationException("Unable to find cvtbackup.sh");
+        ableNasBackupPath = Script.findScript(kvmScriptsDir, "ablestack_nasbackup.sh");
+        if (ableNasBackupPath == null) {
+            throw new ConfigurationException("Unable to find ablestack_nasbackup.sh");
+        }
+
+        ableCvtBackupPath = Script.findScript(kvmScriptsDir, "ablestack_cvtbackup.sh");
+        if (ableCvtBackupPath == null) {
+            throw new ConfigurationException("Unable to find ablestack_cvtbackup.sh");
         }
 
         createTmplPath = Script.findScript(storageScriptsDir, "createtmplt.sh");
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultBackupHelper.java
similarity index 92%
rename from plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultBackupHelper.java
index 9d175634b7c5..df663addd2ce 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultBackupHelper.java
@@ -27,7 +27,7 @@
 import com.cloud.storage.Storage;
 import com.cloud.utils.Pair;
 import com.cloud.utils.script.Script;
-import org.apache.cloudstack.backup.CommvaultTakeBackupCommand;
+import org.apache.cloudstack.backup.AblestackCommvaultTakeBackupCommand;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.libvirt.Connect;
 import org.libvirt.Domain;
@@ -45,8 +45,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-class LibvirtCommvaultBackupHelper {
-    protected Logger LOGGER = LogManager.getLogger(LibvirtCommvaultBackupHelper.class);
+class LibvirtAblestackCommvaultBackupHelper {
+    protected Logger LOGGER = LogManager.getLogger(LibvirtAblestackCommvaultBackupHelper.class);
     static final Integer EXIT_CLEANUP_FAILED = 20;
     private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
 
@@ -68,11 +68,11 @@ String getScriptOperation() {
 
     private final LibvirtComputingResource resource;
 
-    LibvirtCommvaultBackupHelper(LibvirtComputingResource resource) {
+    LibvirtAblestackCommvaultBackupHelper(LibvirtComputingResource resource) {
         this.resource = resource;
     }
 
-    Pair<Integer, String> executeBackup(CommvaultTakeBackupCommand command) {
+    Pair<Integer, String> executeBackup(AblestackCommvaultTakeBackupCommand command) {
         List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
         BackupExecutionMode executionMode = determineExecutionMode(command.getVmName(), command.getVolumePools());
         LOGGER.debug("Commvault backup execution mode=[{}], vm=[{}], backupType=[{}], diskPaths=[{}]",
@@ -109,9 +109,9 @@ List<String> resolveDiskPaths(List<PrimaryDataStoreTO> volumePools, List<String>
         return diskPaths;
     }
 
-    private String[] buildBackupScriptCommand(CommvaultTakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
+    private String[] buildBackupScriptCommand(AblestackCommvaultTakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
         return new String[] {
-                resource.getCvtBackupPath(),
+                resource.getAbleCvtBackupPath(),
                 "-o", executionMode.getScriptOperation(),
                 "-v", command.getVmName(),
                 "-p", command.getBackupPath(),
@@ -143,7 +143,7 @@ private boolean isVmRunning(String vmName) {
         }
     }
 
-    private Pair<Integer, String> executeStoppedVmBackup(CommvaultTakeBackupCommand command, List<String> diskPaths) {
+    private Pair<Integer, String> executeStoppedVmBackup(AblestackCommvaultTakeBackupCommand command, List<String> diskPaths) {
         String dummyVmName = String.format("DUMMY-VM-%s", command.getCheckpointName().replace('.', '-'));
         Path dest = Path.of(command.getBackupPath());
         Connect conn = null;
@@ -258,7 +258,7 @@ private List<String> getDiskLabels(Connect conn, String vmName) {
                 .collect(Collectors.toList());
     }
 
-    private Path writeBackupXml(Path dest, CommvaultTakeBackupCommand command, List<String> diskLabels) throws IOException {
+    private Path writeBackupXml(Path dest, AblestackCommvaultTakeBackupCommand command, List<String> diskLabels) throws IOException {
         StringBuilder xml = new StringBuilder("<domainbackup mode='push'><disks>");
         for (int i = 0; i < diskLabels.size(); i++) {
             String backupFile = getBackupFileByIndex(command, i, String.format("volume-%d.qcow2", i));
@@ -275,7 +275,7 @@ private Path writeBackupXml(Path dest, CommvaultTakeBackupCommand command, List<
         return backupXml;
     }
 
-    private Path writeCheckpointXml(Path dest, CommvaultTakeBackupCommand command, List<String> diskLabels) throws IOException {
+    private Path writeCheckpointXml(Path dest, AblestackCommvaultTakeBackupCommand command, List<String> diskLabels) throws IOException {
         StringBuilder xml = new StringBuilder("<domaincheckpoint><name>").append(command.getCheckpointName()).append("</name><disks>");
         for (String diskLabel : diskLabels) {
             xml.append("<disk name='").append(diskLabel).append("' checkpoint='bitmap'/>");
@@ -316,7 +316,7 @@ private String checkBackupJob(String vmName) {
                 String.format("virsh -c qemu:///system domjobinfo %s --completed --keep-completed", shellQuote(vmName)), 10);
     }
 
-    private void rebaseIncrementalChain(Path dest, CommvaultTakeBackupCommand command, List<String> diskPaths) throws IOException {
+    private void rebaseIncrementalChain(Path dest, AblestackCommvaultTakeBackupCommand command, List<String> diskPaths) throws IOException {
         for (int i = 0; i < diskPaths.size(); i++) {
             String backupFile = getBackupFileByIndex(command, i, String.format("volume-%d.qcow2", i));
             int exit = Script.runSimpleBashScriptForExitValue(String.format(
@@ -343,11 +343,11 @@ private void cleanupDummyVm(String dummyVmName) {
                 shellQuote(dummyVmName), shellQuote(dummyVmName)));
     }
 
-    private boolean isIncremental(CommvaultTakeBackupCommand command) {
+    private boolean isIncremental(AblestackCommvaultTakeBackupCommand command) {
         return "INCREMENTAL".equalsIgnoreCase(command.getBackupType());
     }
 
-    private String getBackupFileByIndex(CommvaultTakeBackupCommand command, int index, String fallback) {
+    private String getBackupFileByIndex(AblestackCommvaultTakeBackupCommand command, int index, String fallback) {
         List<String> backupFiles = command.getBackupFiles();
         if (backupFiles == null || index >= backupFiles.size()) {
             return fallback;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultRestoreBackupCommandWrapper.java
similarity index 99%
rename from plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultRestoreBackupCommandWrapper.java
index 1708a2440857..a407cec9916b 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultRestoreBackupCommandWrapper.java
@@ -32,7 +32,7 @@
 import com.cloud.utils.script.Script;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.backup.BackupAnswer;
-import org.apache.cloudstack.backup.CommvaultRestoreBackupCommand;
+import org.apache.cloudstack.backup.AblestackCommvaultRestoreBackupCommand;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.apache.cloudstack.utils.qemu.QemuImg;
 import org.apache.cloudstack.utils.qemu.QemuImgException;
@@ -53,8 +53,8 @@
 import java.util.Map;
 import java.util.Objects;
 
-@ResourceWrapper(handles = CommvaultRestoreBackupCommand.class)
-public class LibvirtCommvaultRestoreBackupCommandWrapper extends CommandWrapper<CommvaultRestoreBackupCommand, Answer, LibvirtComputingResource> {
+@ResourceWrapper(handles = AblestackCommvaultRestoreBackupCommand.class)
+public class LibvirtAblestackCommvaultRestoreBackupCommandWrapper extends CommandWrapper<AblestackCommvaultRestoreBackupCommand, Answer, LibvirtComputingResource> {
     private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
     private static final String ATTACH_QCOW2_DISK_COMMAND = " virsh attach-disk %s %s %s --driver qemu --subdriver qcow2 --cache none";
     private static final String ATTACH_RBD_DISK_XML_COMMAND = " virsh attach-device %s /dev/stdin <<EOF%sEOF";
@@ -63,7 +63,7 @@ public class LibvirtCommvaultRestoreBackupCommandWrapper extends CommandWrapper<
     private static final String RSYNC_DIR_FROM_REMOTE = "rsync -az -e \"ssh -o StrictHostKeyChecking=no\" %s:%s/ %s/";
 
     @Override
-    public Answer execute(CommvaultRestoreBackupCommand command, LibvirtComputingResource serverResource) {
+    public Answer execute(AblestackCommvaultRestoreBackupCommand command, LibvirtComputingResource serverResource) {
         String vmName = command.getVmName();
         String backupPath = command.getBackupPath();
         Boolean vmExists = command.isVmExists();
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java
similarity index 75%
rename from plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java
index 0fcded1b9c8b..dae16d70d746 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCommvaultTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java
@@ -25,13 +25,13 @@
 import com.cloud.resource.ResourceWrapper;
 import com.cloud.utils.Pair;
 import org.apache.cloudstack.backup.BackupAnswer;
-import org.apache.cloudstack.backup.CommvaultTakeBackupCommand;
+import org.apache.cloudstack.backup.AblestackCommvaultTakeBackupCommand;
 
-@ResourceWrapper(handles = CommvaultTakeBackupCommand.class)
-public class LibvirtCommvaultTakeBackupCommandWrapper extends CommandWrapper<CommvaultTakeBackupCommand, Answer, LibvirtComputingResource> {
+@ResourceWrapper(handles = AblestackCommvaultTakeBackupCommand.class)
+public class LibvirtAblestackCommvaultTakeBackupCommandWrapper extends CommandWrapper<AblestackCommvaultTakeBackupCommand, Answer, LibvirtComputingResource> {
     @Override
-    public Answer execute(CommvaultTakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
-        LibvirtCommvaultBackupHelper backupHelper = new LibvirtCommvaultBackupHelper(libvirtComputingResource);
+    public Answer execute(AblestackCommvaultTakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
+        LibvirtAblestackCommvaultBackupHelper backupHelper = new LibvirtAblestackCommvaultBackupHelper(libvirtComputingResource);
         Pair<Integer, String> result = backupHelper.executeBackup(command);
 
         if (result.first() != 0) {
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
new file mode 100644
index 000000000000..8355d0c366f8
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
@@ -0,0 +1,103 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import com.cloud.utils.script.Script;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.AblestackDeleteBackupCommand;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@ResourceWrapper(handles = AblestackDeleteBackupCommand.class)
+public class LibvirtAblestackDeleteBackupCommandWrapper extends CommandWrapper<AblestackDeleteBackupCommand, Answer, LibvirtComputingResource> {
+    @Override
+    public Answer execute(AblestackDeleteBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
+        final String backupPath = command.getBackupPath();
+        final String backupRepoType = command.getBackupRepoType();
+        final String backupRepoAddress = command.getBackupRepoAddress();
+        final String mountOptions = command.getMountOptions();
+        final String backupProvider = command.getBackupProvider();
+        final String checkpointName = command.getCheckpointName();
+        final String diskPaths = command.getDiskPaths();
+        final boolean forced = command.isForced();
+
+        List<String[]> commands = new ArrayList<>();
+        if ("commvault".equalsIgnoreCase(backupProvider)) {
+            List<String> deleteCommand = new ArrayList<>();
+            deleteCommand.add(libvirtComputingResource.getAbleCvtBackupPath());
+            deleteCommand.add("-o");
+            deleteCommand.add("delete");
+            deleteCommand.add("-p");
+            deleteCommand.add(backupPath);
+            deleteCommand.add("-x");
+            deleteCommand.add(Boolean.toString(forced));
+            if (StringUtils.isNotBlank(checkpointName)) {
+                deleteCommand.add("-c");
+                deleteCommand.add(checkpointName);
+            }
+            if (StringUtils.isNotBlank(diskPaths)) {
+                deleteCommand.add("-d");
+                deleteCommand.add(diskPaths);
+            }
+            commands.add(deleteCommand.toArray(new String[0]));
+        } else {
+            List<String> deleteCommand = new ArrayList<>();
+            deleteCommand.add(libvirtComputingResource.getNasBackupPath());
+            deleteCommand.add("-o");
+            deleteCommand.add("delete");
+            deleteCommand.add("-t");
+            deleteCommand.add(backupRepoType);
+            deleteCommand.add("-s");
+            deleteCommand.add(backupRepoAddress);
+            deleteCommand.add("-m");
+            deleteCommand.add(mountOptions);
+            deleteCommand.add("-p");
+            deleteCommand.add(backupPath);
+            deleteCommand.add("-x");
+            deleteCommand.add(Boolean.toString(forced));
+            if (StringUtils.isNotBlank(checkpointName)) {
+                deleteCommand.add("-c");
+                deleteCommand.add(checkpointName);
+            }
+            if (StringUtils.isNotBlank(diskPaths)) {
+                deleteCommand.add("-d");
+                deleteCommand.add(diskPaths);
+            }
+            commands.add(deleteCommand.toArray(new String[0]));
+        }
+
+        Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
+
+        logger.debug(String.format("Backup delete result: %s , exit code: %s", result.second(), result.first()));
+
+        if (result.first() != 0) {
+            logger.debug(String.format("Failed to delete VM backup: %s", result.second()));
+            return new BackupAnswer(command, false, result.second());
+        }
+        return new BackupAnswer(command, true, null);
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
similarity index 94%
rename from plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
rename to plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
index 74ef0c8e7b04..5c837e6bc75a 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtNasBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
@@ -28,7 +28,7 @@
 import com.cloud.storage.Storage;
 import com.cloud.utils.Pair;
 import com.cloud.utils.script.Script;
-import org.apache.cloudstack.backup.TakeBackupCommand;
+import org.apache.cloudstack.backup.AblestackNasTakeBackupCommand;
 import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 import org.libvirt.Connect;
 import org.libvirt.Domain;
@@ -48,8 +48,8 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-class LibvirtNasBackupHelper {
-    protected Logger LOGGER = LogManager.getLogger(LibvirtNasBackupHelper.class);
+class LibvirtAblestackNasBackupHelper {
+    protected Logger LOGGER = LogManager.getLogger(LibvirtAblestackNasBackupHelper.class);
     static final Integer EXIT_CLEANUP_FAILED = 20;
     private static final int BACKUP_JOB_POLL_INTERVAL_MS = 10000;
 
@@ -71,11 +71,11 @@ String getScriptOperation() {
 
     private final LibvirtComputingResource resource;
 
-    LibvirtNasBackupHelper(LibvirtComputingResource resource) {
+    LibvirtAblestackNasBackupHelper(LibvirtComputingResource resource) {
         this.resource = resource;
     }
 
-    Pair<Integer, String> executeBackup(TakeBackupCommand command) {
+    Pair<Integer, String> executeBackup(AblestackNasTakeBackupCommand command) {
         LOGGER.info("LibvirtNasBackupHelper executeBackup entered for vm=[{}], backupPath=[{}], backupType=[{}]",
                 command.getVmName(), command.getBackupPath(), command.getBackupType());
         List<String> diskPaths = resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
@@ -131,9 +131,9 @@ long parseBackupSize(String output, List<String> diskPaths) {
         return backupSize;
     }
 
-    private String[] buildBackupScriptCommand(TakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
+    private String[] buildBackupScriptCommand(AblestackNasTakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
         return new String[] {
-                resource.getNasBackupPath(),
+                resource.getAblestackNasBackupPath(),
                 "-o", executionMode.getScriptOperation(),
                 "-v", command.getVmName(),
                 "-t", command.getBackupRepoType(),
@@ -175,7 +175,7 @@ private boolean isVmRunning(String vmName) {
         }
     }
 
-    private Pair<Integer, String> executeStoppedVmBackup(TakeBackupCommand command, List<String> diskPaths) {
+    private Pair<Integer, String> executeStoppedVmBackup(AblestackNasTakeBackupCommand command, List<String> diskPaths) {
         Path mountPoint = null;
         String dummyVmName = String.format("DUMMY-VM-%s", command.getCheckpointName().replace('.', '-'));
         Connect conn = null;
@@ -240,7 +240,7 @@ private Pair<Integer, String> executeStoppedVmBackup(TakeBackupCommand command,
         }
     }
 
-    private Path mountRepository(TakeBackupCommand command) throws IOException {
+    private Path mountRepository(AblestackNasTakeBackupCommand command) throws IOException {
         Path mountPoint = Files.createTempDirectory("csbackup.");
         StringBuilder mount = new StringBuilder()
                 .append("mount -t ").append(shellQuote(command.getBackupRepoType()))
@@ -320,7 +320,7 @@ private List<String> getDiskLabels(Connect conn, String vmName) {
                 .collect(Collectors.toList());
     }
 
-    private Path writeBackupXml(Path dest, TakeBackupCommand command, List<String> diskLabels) throws IOException {
+    private Path writeBackupXml(Path dest, AblestackNasTakeBackupCommand command, List<String> diskLabels) throws IOException {
         StringBuilder xml = new StringBuilder("<domainbackup mode='push'>");
         if (isIncremental(command) && command.getParentCheckpointName() != null && !command.getParentCheckpointName().isEmpty()) {
             xml.append("<incremental>").append(command.getParentCheckpointName()).append("</incremental>");
@@ -338,7 +338,7 @@ private Path writeBackupXml(Path dest, TakeBackupCommand command, List<String> d
         return backupXml;
     }
 
-    private Path writeCheckpointXml(Path dest, TakeBackupCommand command, List<String> diskLabels) throws IOException {
+    private Path writeCheckpointXml(Path dest, AblestackNasTakeBackupCommand command, List<String> diskLabels) throws IOException {
         StringBuilder xml = new StringBuilder("<domaincheckpoint><name>")
                 .append(command.getCheckpointName())
                 .append("</name><disks>");
@@ -381,7 +381,7 @@ private String checkBackupJob(String vmName) {
                 String.format("virsh -c qemu:///system domjobinfo %s --completed --keep-completed", shellQuote(vmName)), 10);
     }
 
-    private void rebaseIncrementalChain(Path dest, TakeBackupCommand command, List<String> diskPaths) throws IOException {
+    private void rebaseIncrementalChain(Path dest, AblestackNasTakeBackupCommand command, List<String> diskPaths) throws IOException {
         for (int i = 0; i < diskPaths.size(); i++) {
             String backupFile = getBackupFileByIndex(command, i, String.format("disk-%d.qcow2", i));
             Path output = dest.resolve(backupFile);
@@ -402,7 +402,7 @@ private void dumpCheckpointXml(String vmName, String checkpointName, Path dest)
                 shellQuote(vmName), shellQuote(checkpointName), shellQuote(checkpointDest.toString())));
     }
 
-    private void backupDomainInformation(String vmName, Path dest, TakeBackupCommand command, List<String> diskPaths) {
+    private void backupDomainInformation(String vmName, Path dest, AblestackNasTakeBackupCommand command, List<String> diskPaths) {
         runCommand(String.format("virsh -c qemu:///system dumpxml %s > %s 2>/dev/null || true",
                 shellQuote(vmName), shellQuote(dest.resolve("domain-config.xml").toString())));
         runCommand(String.format("virsh -c qemu:///system dominfo %s > %s 2>/dev/null || true",
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasRestoreBackupCommandWrapper.java
new file mode 100644
index 000000000000..0bd3d6fe2ed5
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasRestoreBackupCommandWrapper.java
@@ -0,0 +1,835 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.storage.Storage;
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import com.cloud.utils.script.Script;
+import com.cloud.vm.VirtualMachine;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.AblestackNasRestoreBackupCommand;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
+import org.apache.cloudstack.utils.qemu.QemuImg;
+import org.apache.cloudstack.utils.qemu.QemuImgException;
+import org.apache.cloudstack.utils.qemu.QemuImgFile;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.libvirt.LibvirtException;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+
+@ResourceWrapper(handles = AblestackNasRestoreBackupCommand.class)
+public class LibvirtAblestackNasRestoreBackupCommandWrapper extends CommandWrapper<AblestackNasRestoreBackupCommand, Answer, LibvirtComputingResource> {
+    private static final String BACKUP_TEMP_FILE_PREFIX = "csbackup";
+    private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s";
+    private static final String UMOUNT_COMMAND = "sudo umount %s";
+    private static final String FILE_PATH_PLACEHOLDER = "%s/%s";
+    private static final String ATTACH_QCOW2_DISK_COMMAND = " virsh attach-disk %s %s %s --driver qemu --subdriver qcow2 --cache none";
+    private static final String ATTACH_RBD_DISK_XML_COMMAND = " virsh attach-device %s /dev/stdin <<EOF%sEOF";
+    private static final String CURRRENT_DEVICE = "virsh domblklist --domain %s | tail -n 3 | head -n 1 | awk '{print $1}'";
+    @Override
+    public Answer execute(AblestackNasRestoreBackupCommand command, LibvirtComputingResource serverResource) {
+        String vmName = command.getVmName();
+        String backupPath = command.getBackupPath();
+        String backupRepoAddress = command.getBackupRepoAddress();
+        String backupRepoType = command.getBackupRepoType();
+        String mountOptions = command.getMountOptions();
+        Boolean vmExists = command.isVmExists();
+        List<PrimaryDataStoreTO> restoreVolumePools = command.getRestoreVolumePools();
+        List<String> restoreVolumePaths = command.getRestoreVolumePaths();
+        Integer mountTimeout = command.getMountTimeout() * 1000;
+        int timeout = command.getWait() > 0 ? command.getWait() : command.getMountTimeout();
+        String cacheMode = command.getCacheMode();
+        KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
+        List<String> volumePaths = command.getVolumePaths();
+        List<String> backupFiles = command.getBackupFiles();
+        List<String> backupFileChains = command.getBackupFileChains();
+
+        String newVolumeId = null;
+        try {
+            String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
+            if (Objects.isNull(vmExists)) {
+                String volumePath = volumePaths.get(0);
+                String backupFile = backupFiles.get(0);
+                String backupFileChain = backupFileChains != null && !backupFileChains.isEmpty() ? backupFileChains.get(0) : null;
+                int lastIndex = volumePath.lastIndexOf("/");
+                newVolumeId = volumePath.substring(lastIndex + 1);
+                restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, backupFile, backupFileChain,
+                        new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, timeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
+            } else if (Boolean.TRUE.equals(vmExists)) {
+                restoreVolumesOfExistingVM(restoreVolumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools);
+            } else {
+                restoreVolumesOfDestroyedVMs(restoreVolumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools, timeout);
+            }
+        } catch (CloudRuntimeException e) {
+            String errorMessage = e.getMessage() != null ? e.getMessage() : "";
+            return new BackupAnswer(command, false, errorMessage);
+        }
+
+        return new BackupAnswer(command, true, newVolumeId);
+    }
+
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
+                                            String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> restoreVolumePools) {
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                String backupFile = backupFiles.get(idx);
+                String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
+                List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+                PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
+                        String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), idx)) {
+                    throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
+                                              String backupRepoAddress, String backupRepoType, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr,
+                                              List<PrimaryDataStoreTO> restoreVolumePools, Integer timeout) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
+        try {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                String volumePath = volumePaths.get(idx);
+                String backupFile = backupFiles.get(idx);
+                String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
+                List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+                PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
+                        String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), idx)) {
+                    throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+    private void restoreVolume(String backupPath, String backupRepoType, String backupRepoAddress, String volumePath, String backupFile, String backupFileChain,
+                               Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, Integer timeout,
+                               KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
+        String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
+        try {
+            List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
+            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
+                    String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), 0, true)) {
+                throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
+            }
+            if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
+                if (!attachVolumeToVm(storagePoolMgr, vmNameAndState.first(), restoreVolumePool, volumePath, cacheMode)) {
+                    throw new CloudRuntimeException(String.format("Failed to attach volume to VM: %s", vmNameAndState.first()));
+                }
+            }
+        } finally {
+            unmountBackupDirectory(mountDirectory);
+            deleteTemporaryDirectory(mountDirectory);
+        }
+    }
+
+
+    private String mountBackupDirectory(String backupRepoAddress, String backupRepoType, String mountOptions, Integer mountTimeout) {
+        String randomChars = RandomStringUtils.random(5, true, false);
+        String mountDirectory = String.format("%s.%s",BACKUP_TEMP_FILE_PREFIX , randomChars);
+
+        try {
+            mountDirectory = Files.createTempDirectory(mountDirectory).toString();
+        } catch (IOException e) {
+            logger.error(String.format("Failed to create the tmp mount directory {} for restore", mountDirectory), e);
+            throw new CloudRuntimeException("Failed to create the tmp mount directory for restore on the KVM host");
+        }
+
+        String mount = String.format(MOUNT_COMMAND, backupRepoType, backupRepoAddress, mountDirectory);
+        if ("cifs".equals(backupRepoType)) {
+            if (Objects.isNull(mountOptions) || mountOptions.trim().isEmpty()) {
+                mountOptions = "nobrl";
+            } else {
+                mountOptions += ",nobrl";
+            }
+        }
+        if (Objects.nonNull(mountOptions) && !mountOptions.trim().isEmpty()) {
+            mount += " -o " + mountOptions;
+        }
+
+        int exitValue = Script.runSimpleBashScriptForExitValue(mount, mountTimeout, false);
+        if (exitValue != 0) {
+            logger.error(String.format("Failed to mount repository {} of type {} to the directory {}", backupRepoAddress, backupRepoType, mountDirectory));
+            throw new CloudRuntimeException("Failed to mount the backup repository on the KVM host");
+        }
+        return mountDirectory;
+    }
+
+    private void unmountBackupDirectory(String backupDirectory) {
+        String umountCmd = String.format(UMOUNT_COMMAND, backupDirectory);
+        int exitValue = Script.runSimpleBashScriptForExitValue(umountCmd);
+        if (exitValue != 0) {
+            logger.error(String.format("Failed to unmount backup directory {}", backupDirectory));
+            throw new CloudRuntimeException("Failed to unmount the backup directory");
+        }
+    }
+
+    private void deleteTemporaryDirectory(String backupDirectory) {
+        try {
+            Files.deleteIfExists(Paths.get(backupDirectory));
+        } catch (IOException e) {
+            logger.error(String.format("Failed to delete backup directory: %s", backupDirectory), e);
+            throw new CloudRuntimeException("Failed to delete the backup directory");
+        }
+    }
+
+    private List<String> getMountedBackupPaths(String mountDirectory, String backupPath, String backupFile, String backupFileChain) {
+        List<String> mountedPaths = new ArrayList<>();
+        if (StringUtils.isNotBlank(backupFileChain)) {
+            for (String chainPath : backupFileChain.split(";")) {
+                if (StringUtils.isBlank(chainPath)) {
+                    continue;
+                }
+                String normalizedPath = chainPath.startsWith("/") ? chainPath.substring(1) : chainPath;
+                if (!normalizedPath.contains("/") && StringUtils.isNotBlank(backupPath)) {
+                    mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), normalizedPath));
+                } else {
+                    mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, mountDirectory, normalizedPath));
+                }
+            }
+        }
+        if (mountedPaths.isEmpty() && StringUtils.isNotBlank(backupFile)) {
+            mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), backupFile));
+        }
+        return mountedPaths;
+    }
+
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
+                                            String backupRootPath, int backupIndex) {
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, backupRootPath, backupIndex, false);
+    }
+
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
+                                            String backupRootPath, int backupIndex, boolean createTargetVolume) {
+        if (backupPaths == null || backupPaths.isEmpty()) {
+            return false;
+        }
+        if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
+            if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+                return restoreIncrementalRbdBackupChainToFileVolume(volumePath, backupPaths, timeout, backupRootPath, backupIndex);
+            }
+            return replaceFileVolumeWithBackup(volumePath, getFirstExistingBackupPath(backupPaths), timeout);
+        }
+
+        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
+    }
+
+    private boolean restoreIncrementalRbdBackupChainToFileVolume(String volumePath, List<String> backupPaths, int timeout, String backupRootPath, int backupIndex) {
+        if (StringUtils.isBlank(backupRootPath)) {
+            throw new CloudRuntimeException("Unable to locate backup root path for incremental RBD restore");
+        }
+        RbdImageSpec sourceImage = getRbdImageSpecFromMetadata(backupRootPath, backupIndex);
+        String tempImage = sourceImage.buildTempImageSpec();
+        try {
+            if (!importBackupChainToTemporaryRbd(backupPaths, timeout, sourceImage, tempImage)) {
+                return false;
+            }
+            return convertTemporaryRbdToFileVolume(volumePath, timeout, sourceImage, tempImage);
+        } finally {
+            removeTemporaryRbdImage(sourceImage, tempImage, timeout);
+        }
+    }
+
+    private String getFirstExistingBackupPath(List<String> backupPaths) {
+        for (String backupPath : backupPaths) {
+            if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
+                return backupPath;
+            }
+        }
+        return backupPaths.get(0);
+    }
+
+    private boolean replaceFileVolumeWithBackup(String volumePath, String backupPath, int timeout) {
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
+            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
+            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
+            qemu.convert(srcBackupFile, destVolumeFile);
+            return true;
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
+            logger.error("Failed to convert backup {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
+        }
+    }
+
+    private boolean convertTemporaryRbdToFileVolume(String volumePath, int timeout, RbdImageSpec sourceImage, String tempImage) {
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
+            srcBackupFile = new QemuImgFile(sourceImage.buildQemuUri(tempImage), QemuImg.PhysicalDiskFormat.RAW);
+            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
+            qemu.convert(srcBackupFile, destVolumeFile);
+            return true;
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : tempImage;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : volumePath;
+            logger.error("Failed to convert temporary RBD {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
+        }
+    }
+
+    private QemuImg.PhysicalDiskFormat getBackupFileFormat(String backupPath) {
+        if (backupPath.endsWith(".raw")) {
+            return QemuImg.PhysicalDiskFormat.RAW;
+        }
+        return QemuImg.PhysicalDiskFormat.QCOW2;
+    }
+
+    private QemuImg.PhysicalDiskFormat getFileVolumeFormat(String volumePath) {
+        if (!Files.exists(Paths.get(volumePath))) {
+            return QemuImg.PhysicalDiskFormat.QCOW2;
+        }
+        try {
+            QemuImg qemu = new QemuImg(0);
+            Map<String, String> info = qemu.info(new QemuImgFile(volumePath));
+            String format = info.get("file_format");
+            if (StringUtils.isNotBlank(format)) {
+                return QemuImg.PhysicalDiskFormat.valueOf(format.toUpperCase(Locale.ROOT));
+            }
+        } catch (QemuImgException | LibvirtException | IllegalArgumentException e) {
+            logger.warn("Failed to detect file volume format for path {}. Falling back to qcow2.", volumePath, e);
+        }
+        return QemuImg.PhysicalDiskFormat.QCOW2;
+    }
+
+    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
+        if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
+            return restoreIncrementalRbdBackupChain(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
+        }
+
+        String backupPath = getFirstExistingBackupPath(backupPaths);
+        KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, volumeStoragePool);
+        if (getBackupFileFormat(backupPath) == QemuImg.PhysicalDiskFormat.RAW) {
+            return importRawBackupToRbd(volumeStoragePool, normalizedVolumePath, backupPath, timeout, createTargetVolume);
+        }
+
+        QemuImg qemu;
+        try {
+            qemu = new QemuImg(timeout * 1000, true, false);
+            if (!createTargetVolume) {
+                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(normalizedVolumePath);
+                logger.debug("Restoring RBD volume: {}", rdbDisk.toString());
+                qemu.setSkipTargetVolumeCreation(true);
+            }
+        } catch (LibvirtException ex) {
+            throw new CloudRuntimeException("Failed to create qemu-img command to restore RBD volume with backup", ex);
+        }
+
+        QemuImgFile srcBackupFile = null;
+        QemuImgFile destVolumeFile = null;
+        try {
+            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
+            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, normalizedVolumePath);
+            destVolumeFile = new QemuImgFile(rbdDestVolumeFile, QemuImg.PhysicalDiskFormat.RAW);
+
+            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, normalizedVolumePath);
+            qemu.convert(srcBackupFile, destVolumeFile);
+            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, normalizedVolumePath);
+        } catch (QemuImgException | LibvirtException e) {
+            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
+            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
+            logger.error("Failed to convert backup {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean importRawBackupToRbd(KVMStoragePool volumeStoragePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+        if (!createTargetVolume && !volumeStoragePool.deletePhysicalDisk(volumePath, Storage.ImageFormat.RAW)) {
+            logger.error("Failed to delete existing RBD volume {} before raw import", volumePath);
+            return false;
+        }
+
+        String importCommand = buildRbdImportCommand(volumeStoragePool, backupPath, volumePath);
+        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to import raw backup {} into volume {}", backupPath, volumePath);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths,
+                                                     int timeout, boolean createTargetVolume) {
+        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
+            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
+        }
+
+        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid()));
+        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, normalizedVolumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
+            return false;
+        }
+
+        KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        List<String> restoreSnapshots = new ArrayList<>();
+        try {
+            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
+            String baseCheckpoint = baseMetadata.get("checkpoint_name");
+            if (StringUtils.isNotBlank(baseCheckpoint)) {
+                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, baseCheckpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(baseCheckpoint);
+            }
+
+            for (int index = 1; index < backupPaths.size(); index++) {
+                String backupPath = backupPaths.get(index);
+                if (!backupPath.endsWith(".rbdiff")) {
+                    continue;
+                }
+
+                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
+                String parentCheckpoint = metadata.get("parent_checkpoint_name");
+                String checkpoint = metadata.get("checkpoint_name");
+                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
+                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
+                }
+                if (!rbdSnapshotExists(volumeStoragePool, normalizedVolumePath, parentCheckpoint, timeout)) {
+                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on volume %s", parentCheckpoint, normalizedVolumePath));
+                }
+
+                String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
+                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                    logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
+                    return false;
+                }
+
+                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, checkpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(checkpoint);
+            }
+            return true;
+        } finally {
+            cleanupRbdRestoreSnapshots(volumeStoragePool, normalizedVolumePath, restoreSnapshots, timeout);
+        }
+    }
+
+    private String normalizeRbdVolumePath(String volumePath, KVMStoragePool storagePool) {
+        if (StringUtils.isBlank(volumePath)) {
+            return volumePath;
+        }
+        String normalized = volumePath;
+        String poolPath = storagePool.getSourceDir();
+        if (StringUtils.isNotBlank(poolPath)) {
+            String poolPrefix = poolPath + "/";
+            if (normalized.startsWith(poolPrefix)) {
+                normalized = normalized.substring(poolPrefix.length());
+            }
+        }
+        if (normalized.startsWith("/")) {
+            normalized = normalized.substring(normalized.lastIndexOf('/') + 1);
+        }
+        return normalized;
+    }
+
+    private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" import-diff ").append(backupPath).append(" ").append(volumePath);
+        return command.toString();
+    }
+
+    private String buildRbdImportCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" import ").append(backupPath).append(" ").append(volumePath);
+        return command.toString();
+    }
+
+    private String formatRbdMonHosts(String hosts, int port) {
+        String[] hostValues = hosts.split(",");
+        List<String> formattedHosts = new ArrayList<>();
+        for (String host : hostValues) {
+            String normalizedHost = host.replace("[", "").replace("]", "").trim();
+            if (StringUtils.isBlank(normalizedHost)) {
+                continue;
+            }
+            formattedHosts.add(port > 0 ? normalizedHost + ":" + port : normalizedHost);
+        }
+        return String.join(",", formattedHosts);
+    }
+
+    private boolean importBackupChainToTemporaryRbd(List<String> backupPaths, int timeout, RbdImageSpec sourceImage, String tempImage) {
+        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
+            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
+        }
+        String importCommand = sourceImage.buildRbdCommand("import", quote(backupPaths.get(0)), quote(tempImage));
+        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to import base RBD backup {} into temporary image {}", backupPaths.get(0), tempImage);
+            return false;
+        }
+
+        List<String> restoreSnapshots = new ArrayList<>();
+        try {
+            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
+            String baseCheckpoint = baseMetadata.get("checkpoint_name");
+            if (StringUtils.isNotBlank(baseCheckpoint)) {
+                if (!ensureRbdSnapshotExists(sourceImage, tempImage, baseCheckpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(baseCheckpoint);
+            }
+
+            for (int index = 1; index < backupPaths.size(); index++) {
+                String backupPath = backupPaths.get(index);
+                if (!backupPath.endsWith(".rbdiff")) {
+                    continue;
+                }
+                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
+                String parentCheckpoint = metadata.get("parent_checkpoint_name");
+                String checkpoint = metadata.get("checkpoint_name");
+                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
+                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
+                }
+                if (!rbdSnapshotExists(sourceImage, tempImage, parentCheckpoint, timeout)) {
+                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on temporary image %s", parentCheckpoint, tempImage));
+                }
+                String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
+                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
+                    logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
+                    return false;
+                }
+                if (!ensureRbdSnapshotExists(sourceImage, tempImage, checkpoint, timeout)) {
+                    return false;
+                }
+                restoreSnapshots.add(checkpoint);
+            }
+            return true;
+        } finally {
+            cleanupRbdRestoreSnapshots(sourceImage, tempImage, restoreSnapshots, timeout);
+        }
+    }
+
+    private Map<String, String> readRbdBackupMetadata(String backupPath) {
+        java.nio.file.Path metadataPath = Paths.get(backupPath).getParent().resolve("rbd-backup.meta");
+        if (!Files.exists(metadataPath)) {
+            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
+        }
+        try {
+            return Files.readAllLines(metadataPath).stream()
+                    .map(String::trim)
+                    .filter(line -> !line.isEmpty() && line.contains("="))
+                    .map(line -> line.split("=", 2))
+                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
+        }
+    }
+
+    private boolean ensureRbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
+        if (rbdSnapshotExists(storagePool, volumePath, snapshotName, timeout)) {
+            return true;
+        }
+        String createSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap create", volumePath + "@" + snapshotName);
+        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to create RBD snapshot {} on volume {}", snapshotName, volumePath);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean ensureRbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
+        if (rbdSnapshotExists(imageSpec, image, snapshotName, timeout)) {
+            return true;
+        }
+        String createSnapshotCommand = imageSpec.buildRbdCommand("snap", "create", quote(image + "@" + snapshotName));
+        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
+            logger.error("Failed to create RBD snapshot {} on image {}", snapshotName, image);
+            return false;
+        }
+        return true;
+    }
+
+    private boolean rbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
+        String existsCommand = buildRbdSnapshotCommand(storagePool, "snap ls", volumePath) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
+        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
+    }
+
+    private boolean rbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
+        String existsCommand = imageSpec.buildRbdCommand("snap", "ls", quote(image)) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
+        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
+    }
+
+    private void cleanupRbdRestoreSnapshots(KVMStoragePool storagePool, String volumePath, List<String> snapshotNames, int timeout) {
+        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
+            String snapshotName = snapshotNames.get(index);
+            String removeSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap rm", volumePath + "@" + snapshotName);
+            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
+        }
+    }
+
+    private void cleanupRbdRestoreSnapshots(RbdImageSpec imageSpec, String image, List<String> snapshotNames, int timeout) {
+        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
+            String snapshotName = snapshotNames.get(index);
+            String removeSnapshotCommand = imageSpec.buildRbdCommand("snap", "rm", quote(image + "@" + snapshotName));
+            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
+        }
+    }
+
+    private String buildRbdSnapshotCommand(KVMStoragePool storagePool, String action, String target) {
+        StringBuilder command = new StringBuilder("rbd");
+        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
+            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
+            command.append(" --id ").append(storagePool.getAuthUserName());
+        }
+        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
+            command.append(" --key ").append(storagePool.getAuthSecret());
+        }
+        command.append(" ").append(action).append(" ").append(target);
+        return command.toString();
+    }
+
+    private void removeTemporaryRbdImage(RbdImageSpec sourceImage, String tempImage, int timeout) {
+        String removeCommand = sourceImage.buildRbdCommand("rm", quote(tempImage));
+        Script.runSimpleBashScriptForExitValue(removeCommand, timeout * 1000, false);
+    }
+
+    private RbdImageSpec getRbdImageSpecFromMetadata(String backupRootPath, int backupIndex) {
+        java.nio.file.Path metadataPath = Paths.get(backupRootPath, "rbd-backup.meta");
+        if (!Files.exists(metadataPath)) {
+            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
+        }
+        try {
+            Map<String, String> metadata = Files.readAllLines(metadataPath).stream()
+                    .map(String::trim)
+                    .filter(line -> !line.isEmpty() && line.contains("="))
+                    .map(line -> line.split("=", 2))
+                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
+            String diskPaths = metadata.get("disk_paths");
+            if (StringUtils.isBlank(diskPaths)) {
+                throw new CloudRuntimeException("RBD backup metadata does not contain disk_paths");
+            }
+            List<String> values = Arrays.asList(diskPaths.split(","));
+            if (backupIndex >= values.size()) {
+                throw new CloudRuntimeException(String.format("RBD backup metadata does not contain disk path for index %d", backupIndex));
+            }
+            return RbdImageSpec.fromUri(values.get(backupIndex));
+        } catch (IOException e) {
+            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
+        }
+    }
+
+    private String quote(String value) {
+        return "'" + value.replace("'", "'\"'\"'") + "'";
+    }
+
+    private static final class RbdImageSpec {
+        private final String image;
+        private final String monHost;
+        private final String user;
+        private final String key;
+
+        private RbdImageSpec(String image, String monHost, String user, String key) {
+            this.image = image;
+            this.monHost = monHost;
+            this.user = user;
+            this.key = key;
+        }
+
+        private static RbdImageSpec fromUri(String uri) {
+            String image = null;
+            String monHost = null;
+            String user = null;
+            String key = null;
+            if (uri.startsWith("rbd:")) {
+                String payload = uri.substring("rbd:".length());
+                image = payload.contains(":") ? payload.substring(0, payload.indexOf(':')) : payload;
+                monHost = extract(uri, ":mon_host=([^:]*)");
+                if (monHost != null) {
+                    monHost = monHost.replace("\\;", ",").replace("\\:", ":");
+                }
+                user = extract(uri, ":id=([^:]*)");
+                key = extract(uri, ":key=([^:]*)");
+            } else if (uri.startsWith("rbd/")) {
+                image = uri;
+            }
+            if (StringUtils.isBlank(image)) {
+                throw new CloudRuntimeException(String.format("Unable to parse RBD disk path: %s", uri));
+            }
+            return new RbdImageSpec(image, monHost, user, key);
+        }
+
+        private static String extract(String value, String regex) {
+            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile(regex).matcher(value);
+            return matcher.find() ? matcher.group(1) : null;
+        }
+
+        private String buildTempImageSpec() {
+            return String.format("%s-csrestore-%s", image, RandomStringUtils.randomAlphanumeric(8).toLowerCase(Locale.ROOT));
+        }
+
+        private String buildRbdCommand(String action, String source, String target) {
+            StringBuilder command = new StringBuilder("rbd");
+            if (StringUtils.isNotBlank(monHost)) {
+                command.append(" -m ").append(quoteArg(monHost));
+            }
+            if (StringUtils.isNotBlank(user)) {
+                command.append(" --id ").append(quoteArg(user));
+            }
+            if (StringUtils.isNotBlank(key)) {
+                command.append(" --key ").append(quoteArg(key));
+            }
+            command.append(" ").append(action);
+            if (StringUtils.isNotBlank(source)) {
+                command.append(" ").append(source);
+            }
+            if (StringUtils.isNotBlank(target)) {
+                command.append(" ").append(target);
+            }
+            return command.toString();
+        }
+
+        private String buildRbdCommand(String action, String target) {
+            return buildRbdCommand(action, null, target);
+        }
+
+        private String buildQemuUri(String imageSpec) {
+            StringBuilder uri = new StringBuilder("rbd:").append(imageSpec);
+            if (StringUtils.isNotBlank(monHost)) {
+                uri.append(":mon_host=").append(monHost.replace(",", "\\;"));
+            }
+            if (StringUtils.isNotBlank(user)) {
+                uri.append(":id=").append(user);
+            }
+            if (StringUtils.isNotBlank(key)) {
+                uri.append(":key=").append(key);
+            }
+            return uri.toString();
+        }
+
+        private String quoteArg(String value) {
+            return "'" + value.replace("'", "'\"'\"'") + "'";
+        }
+    }
+
+    private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr, String vmName, PrimaryDataStoreTO volumePool, String volumePath, String cacheMode) {
+        String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
+        int exitValue;
+        if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
+            exitValue = Script.runSimpleBashScriptForExitValue(String.format(ATTACH_QCOW2_DISK_COMMAND, vmName, volumePath, deviceToAttachDiskTo));
+        } else {
+            String xmlForRbdDisk = getXmlForRbdDisk(storagePoolMgr, volumePool, volumePath, deviceToAttachDiskTo, cacheMode);
+            logger.debug("RBD disk xml to attach: {}", xmlForRbdDisk);
+            exitValue = Script.runSimpleBashScriptForExitValue(String.format(ATTACH_RBD_DISK_XML_COMMAND, vmName, xmlForRbdDisk));
+        }
+        return exitValue == 0;
+    }
+
+    private String getDeviceToAttachDisk(String vmName) {
+        String currentDevice = Script.runSimpleBashScript(String.format(CURRRENT_DEVICE, vmName));
+        char lastChar = currentDevice.charAt(currentDevice.length() - 1);
+        char incrementedChar = (char) (lastChar + 1);
+        return currentDevice.substring(0, currentDevice.length() - 1) + incrementedChar;
+    }
+
+    private String getXmlForRbdDisk(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String deviceToAttachDiskTo, String cacheMode) {
+        StringBuilder diskBuilder = new StringBuilder();
+        diskBuilder.append("\n<disk ");
+        diskBuilder.append(" device='disk'");
+        diskBuilder.append(" type='network'");
+        diskBuilder.append(">\n");
+
+        diskBuilder.append("<driver name='qemu' type='raw'");
+        if (StringUtils.isBlank(cacheMode)) {
+            cacheMode = "none";
+        }
+        diskBuilder.append(" cache='").append(cacheMode).append("'/> \n");
+
+        diskBuilder.append("<source ");
+        diskBuilder.append(" protocol='rbd'");
+        diskBuilder.append(" name='" + volumePath + "'");
+        diskBuilder.append(">\n");
+        for (String sourceHost : volumePool.getHost().split(",")) {
+            diskBuilder.append("<host name='");
+            diskBuilder.append(sourceHost.replace("[", "").replace("]", ""));
+            if (volumePool.getPort() != 0) {
+                diskBuilder.append("' port='");
+                diskBuilder.append(volumePool.getPort());
+            }
+            diskBuilder.append("'/>\n");
+        }
+        diskBuilder.append("</source>\n");
+        String authUserName = null;
+        final KVMStoragePool primaryPool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+        if (primaryPool != null) {
+            authUserName = primaryPool.getAuthUserName();
+        }
+        if (StringUtils.isNotBlank(authUserName)) {
+            diskBuilder.append("<auth username='" + authUserName + "'>\n");
+            diskBuilder.append("<secret type='ceph' uuid='" + volumePool.getUuid() + "'/>\n");
+            diskBuilder.append("</auth>\n");
+        }
+        diskBuilder.append("<target dev='" + deviceToAttachDiskTo + "'");
+        diskBuilder.append(" bus='virtio'");
+        diskBuilder.append("/>\n");
+        diskBuilder.append("</disk>\n");
+        return diskBuilder.toString();
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java
new file mode 100644
index 000000000000..a954efd74ec3
--- /dev/null
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java
@@ -0,0 +1,61 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.Pair;
+import org.apache.cloudstack.backup.BackupAnswer;
+import org.apache.cloudstack.backup.AblestackNasTakeBackupCommand;
+
+import java.util.List;
+
+@ResourceWrapper(handles = AblestackNasTakeBackupCommand.class)
+public class LibvirtAblestackTakeBackupCommandWrapper extends CommandWrapper<AblestackNasTakeBackupCommand, Answer, LibvirtComputingResource> {
+    @Override
+    public Answer execute(AblestackNasTakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
+        logger.info("LibvirtTakeBackupCommandWrapper entering execute for vm=[{}], backupPath=[{}], backupType=[{}]",
+                command.getVmName(), command.getBackupPath(), command.getBackupType());
+        LibvirtNasBackupHelper backupHelper = new LibvirtNasBackupHelper(libvirtComputingResource);
+        List<String> diskPaths = backupHelper.resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
+        logger.info("LibvirtTakeBackupCommandWrapper invoking helper for vm=[{}], diskPaths=[{}]",
+                command.getVmName(), diskPaths);
+        Pair<Integer, String> result = backupHelper.executeBackup(command);
+        logger.info("LibvirtTakeBackupCommandWrapper helper returned for vm=[{}], resultCode=[{}], details=[{}]",
+                command.getVmName(), result.first(), result.second());
+
+        if (result.first() != 0) {
+            logger.debug("Failed to take VM backup: " + result.second());
+            BackupAnswer answer = new BackupAnswer(command, false, result.second().trim());
+            if (result.first() == LibvirtNasBackupHelper.EXIT_CLEANUP_FAILED) {
+                logger.debug("Backup cleanup failed");
+                answer.setNeedsCleanup(true);
+            }
+            return answer;
+        }
+
+        long backupSize = backupHelper.parseBackupSize(result.second(), diskPaths);
+        BackupAnswer answer = new BackupAnswer(command, true, result.second().trim());
+        answer.setSize(backupSize);
+        return answer;
+    }
+}
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
index deaf1f6c2abe..4772d3b472cf 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtDeleteBackupCommandWrapper.java
@@ -27,7 +27,6 @@
 import com.cloud.utils.script.Script;
 import org.apache.cloudstack.backup.BackupAnswer;
 import org.apache.cloudstack.backup.DeleteBackupCommand;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -40,55 +39,16 @@ public Answer execute(DeleteBackupCommand command, LibvirtComputingResource libv
         final String backupRepoType = command.getBackupRepoType();
         final String backupRepoAddress = command.getBackupRepoAddress();
         final String mountOptions = command.getMountOptions();
-        final String backupProvider = command.getBackupProvider();
-        final String checkpointName = command.getCheckpointName();
-        final String diskPaths = command.getDiskPaths();
-        final boolean forced = command.isForced();
 
         List<String[]> commands = new ArrayList<>();
-        if ("commvault".equalsIgnoreCase(backupProvider)) {
-            List<String> deleteCommand = new ArrayList<>();
-            deleteCommand.add(libvirtComputingResource.getCvtBackupPath());
-            deleteCommand.add("-o");
-            deleteCommand.add("delete");
-            deleteCommand.add("-p");
-            deleteCommand.add(backupPath);
-            deleteCommand.add("-x");
-            deleteCommand.add(Boolean.toString(forced));
-            if (StringUtils.isNotBlank(checkpointName)) {
-                deleteCommand.add("-c");
-                deleteCommand.add(checkpointName);
-            }
-            if (StringUtils.isNotBlank(diskPaths)) {
-                deleteCommand.add("-d");
-                deleteCommand.add(diskPaths);
-            }
-            commands.add(deleteCommand.toArray(new String[0]));
-        } else {
-            List<String> deleteCommand = new ArrayList<>();
-            deleteCommand.add(libvirtComputingResource.getNasBackupPath());
-            deleteCommand.add("-o");
-            deleteCommand.add("delete");
-            deleteCommand.add("-t");
-            deleteCommand.add(backupRepoType);
-            deleteCommand.add("-s");
-            deleteCommand.add(backupRepoAddress);
-            deleteCommand.add("-m");
-            deleteCommand.add(mountOptions);
-            deleteCommand.add("-p");
-            deleteCommand.add(backupPath);
-            deleteCommand.add("-x");
-            deleteCommand.add(Boolean.toString(forced));
-            if (StringUtils.isNotBlank(checkpointName)) {
-                deleteCommand.add("-c");
-                deleteCommand.add(checkpointName);
-            }
-            if (StringUtils.isNotBlank(diskPaths)) {
-                deleteCommand.add("-d");
-                deleteCommand.add(diskPaths);
-            }
-            commands.add(deleteCommand.toArray(new String[0]));
-        }
+        commands.add(new String[]{
+                libvirtComputingResource.getNasBackupPath(),
+                "-o", "delete",
+                "-t", backupRepoType,
+                "-s", backupRepoAddress,
+                "-m", mountOptions,
+                "-p", backupPath
+        });
 
         Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 8964f9e29a9f..8a28f0df48df 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -44,11 +44,8 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Objects;
 
 @ResourceWrapper(handles = RestoreBackupCommand.class)
@@ -60,6 +57,8 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper<RestoreBa
     private static final String ATTACH_QCOW2_DISK_COMMAND = " virsh attach-disk %s %s %s --driver qemu --subdriver qcow2 --cache none";
     private static final String ATTACH_RBD_DISK_XML_COMMAND = " virsh attach-device %s /dev/stdin <<EOF%sEOF";
     private static final String CURRRENT_DEVICE = "virsh domblklist --domain %s | tail -n 3 | head -n 1 | awk '{print $1}'";
+    private static final String RSYNC_COMMAND = "rsync -az %s %s";
+
     @Override
     public Answer execute(RestoreBackupCommand command, LibvirtComputingResource serverResource) {
         String vmName = command.getVmName();
@@ -68,15 +67,17 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
         String backupRepoType = command.getBackupRepoType();
         String mountOptions = command.getMountOptions();
         Boolean vmExists = command.isVmExists();
+        String diskType = command.getDiskType();
+        List<String> backedVolumeUUIDs = command.getBackupVolumesUUIDs();
         List<PrimaryDataStoreTO> restoreVolumePools = command.getRestoreVolumePools();
         List<String> restoreVolumePaths = command.getRestoreVolumePaths();
+        // String restoreVolumeUuid = command.getRestoreVolumeUUID();
         Integer mountTimeout = command.getMountTimeout() * 1000;
-        int timeout = command.getWait() > 0 ? command.getWait() : command.getMountTimeout();
+        int timeout = command.getWait();
         String cacheMode = command.getCacheMode();
         KVMStoragePoolManager storagePoolMgr = serverResource.getStoragePoolMgr();
         List<String> volumePaths = command.getVolumePaths();
         List<String> backupFiles = command.getBackupFiles();
-        List<String> backupFileChains = command.getBackupFileChains();
 
         String newVolumeId = null;
         try {
@@ -84,15 +85,14 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
             if (Objects.isNull(vmExists)) {
                 String volumePath = volumePaths.get(0);
                 String backupFile = backupFiles.get(0);
-                String backupFileChain = backupFileChains != null && !backupFileChains.isEmpty() ? backupFileChains.get(0) : null;
                 int lastIndex = volumePath.lastIndexOf("/");
                 newVolumeId = volumePath.substring(lastIndex + 1);
-                restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, backupFile, backupFileChain,
-                        new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, timeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
+                restoreVolume(backupPath, backupRepoType, backupRepoAddress, volumePath, diskType, backupFile,
+                        new Pair<>(vmName, command.getVmState()), mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), cacheMode);
             } else if (Boolean.TRUE.equals(vmExists)) {
-                restoreVolumesOfExistingVM(restoreVolumePaths, backupPath, backupFiles, backupFileChains, mountDirectory, timeout, storagePoolMgr, restoreVolumePools);
+                restoreVolumesOfExistingVM(volumePaths, backupPath, backupFiles, backupRepoType, backupRepoAddress, mountOptions, mountDirectory, timeout, storagePoolMgr, restoreVolumePools.get(0));
             } else {
-                restoreVolumesOfDestroyedVMs(restoreVolumePaths, backupPath, backupFiles, backupFileChains, backupRepoAddress, backupRepoType, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools, timeout);
+                restoreVolumesOfDestroyedVMs(volumePaths, vmName, backupPath, backupFiles, backupRepoType, backupRepoAddress, mountOptions, mountTimeout, storagePoolMgr, restoreVolumePools.get(0), timeout);
             }
         } catch (CloudRuntimeException e) {
             String errorMessage = e.getMessage() != null ? e.getMessage() : "";
@@ -102,17 +102,16 @@ public Answer execute(RestoreBackupCommand command, LibvirtComputingResource ser
         return new BackupAnswer(command, true, newVolumeId);
     }
 
-    private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
-                                            String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, List<PrimaryDataStoreTO> restoreVolumePools) {
+    private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupPath, List<String> backupFiles,
+                                             String backupRepoType, String backupRepoAddress, String mountOptions, String mountDirectory, Integer timeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool) {
+        String diskType = "root";
         try {
             for (int idx = 0; idx < volumePaths.size(); idx++) {
                 String volumePath = volumePaths.get(idx);
                 String backupFile = backupFiles.get(idx);
-                String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
-                List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
-                PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
-                        String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), idx)) {
+                String bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
+                diskType = "datadisk";
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, bkpPath, timeout)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
             }
@@ -122,19 +121,17 @@ private void restoreVolumesOfExistingVM(List<String> volumePaths, String backupP
         }
     }
 
-    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backupPath, List<String> backupFiles, List<String> backupFileChains,
-                                              String backupRepoAddress, String backupRepoType, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr,
-                                              List<PrimaryDataStoreTO> restoreVolumePools, Integer timeout) {
+    private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String vmName, String backupPath, List<String> backupFiles,
+                                              String backupRepoType, String backupRepoAddress, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, Integer timeout) {
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
+        String diskType = "root";
         try {
             for (int idx = 0; idx < volumePaths.size(); idx++) {
                 String volumePath = volumePaths.get(idx);
                 String backupFile = backupFiles.get(idx);
-                String backupFileChain = backupFileChains != null && backupFileChains.size() > idx ? backupFileChains.get(idx) : null;
-                List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
-                PrimaryDataStoreTO restoreVolumePool = restoreVolumePools.get(idx);
-                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
-                        String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), idx)) {
+                String bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
+                diskType = "datadisk";
+                if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, bkpPath, timeout)) {
                     throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
                 }
             }
@@ -144,14 +141,13 @@ private void restoreVolumesOfDestroyedVMs(List<String> volumePaths, String backu
         }
     }
 
-    private void restoreVolume(String backupPath, String backupRepoType, String backupRepoAddress, String volumePath, String backupFile, String backupFileChain,
-                               Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, Integer timeout,
-                               KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
+    private void restoreVolume(String backupPath, String backupRepoType, String backupRepoAddress, String volumePath,
+                               String diskType, String backupFile, Pair<String, VirtualMachine.State> vmNameAndState, String mountOptions, Integer mountTimeout, KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO restoreVolumePool, String cacheMode) {
         String mountDirectory = mountBackupDirectory(backupRepoAddress, backupRepoType, mountOptions, mountTimeout);
+        String bkpPath;
         try {
-            List<String> mountedBackupPaths = getMountedBackupPaths(mountDirectory, backupPath, backupFile, backupFileChain);
-            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, mountedBackupPaths, timeout,
-                    String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), 0, true)) {
+            bkpPath = getBackupPath(mountDirectory, backupPath, backupFile, diskType);
+            if (!replaceVolumeWithBackup(storagePoolMgr, restoreVolumePool, volumePath, bkpPath, mountTimeout)) {
                 throw new CloudRuntimeException(String.format("Unable to restore backup from volume [%s].", volumePath));
             }
             if (VirtualMachine.State.Running.equals(vmNameAndState.second())) {
@@ -215,147 +211,43 @@ private void deleteTemporaryDirectory(String backupDirectory) {
         }
     }
 
-    private List<String> getMountedBackupPaths(String mountDirectory, String backupPath, String backupFile, String backupFileChain) {
-        List<String> mountedPaths = new ArrayList<>();
-        if (StringUtils.isNotBlank(backupFileChain)) {
-            for (String chainPath : backupFileChain.split(";")) {
-                if (StringUtils.isBlank(chainPath)) {
-                    continue;
-                }
-                String normalizedPath = chainPath.startsWith("/") ? chainPath.substring(1) : chainPath;
-                if (!normalizedPath.contains("/") && StringUtils.isNotBlank(backupPath)) {
-                    mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), normalizedPath));
-                } else {
-                    mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, mountDirectory, normalizedPath));
-                }
-            }
-        }
-        if (mountedPaths.isEmpty() && StringUtils.isNotBlank(backupFile)) {
-            mountedPaths.add(String.format(FILE_PATH_PLACEHOLDER, String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath), backupFile));
-        }
-        return mountedPaths;
+    private String getBackupPath(String mountDirectory, String backupPath, String backupFile, String diskType) {
+        String bkpPath = String.format(FILE_PATH_PLACEHOLDER, mountDirectory, backupPath);
+        String backupFileName = String.format("%s.%s.qcow2", diskType.toLowerCase(Locale.ROOT), backupFile);
+        bkpPath = String.format(FILE_PATH_PLACEHOLDER, bkpPath, backupFileName);
+        return bkpPath;
     }
 
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
-                                            String backupRootPath, int backupIndex) {
-        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, backupRootPath, backupIndex, false);
-    }
-
-    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout,
-                                            String backupRootPath, int backupIndex, boolean createTargetVolume) {
-        if (backupPaths == null || backupPaths.isEmpty()) {
-            return false;
-        }
-        if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
-            if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
-                return restoreIncrementalRbdBackupChainToFileVolume(volumePath, backupPaths, timeout, backupRootPath, backupIndex);
-            }
-            return replaceFileVolumeWithBackup(volumePath, getFirstExistingBackupPath(backupPaths), timeout);
-        }
-
-        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
-    }
-
-    private boolean restoreIncrementalRbdBackupChainToFileVolume(String volumePath, List<String> backupPaths, int timeout, String backupRootPath, int backupIndex) {
-        if (StringUtils.isBlank(backupRootPath)) {
-            throw new CloudRuntimeException("Unable to locate backup root path for incremental RBD restore");
-        }
-        RbdImageSpec sourceImage = getRbdImageSpecFromMetadata(backupRootPath, backupIndex);
-        String tempImage = sourceImage.buildTempImageSpec();
-        try {
-            if (!importBackupChainToTemporaryRbd(backupPaths, timeout, sourceImage, tempImage)) {
-                return false;
-            }
-            return convertTemporaryRbdToFileVolume(volumePath, timeout, sourceImage, tempImage);
-        } finally {
-            removeTemporaryRbdImage(sourceImage, tempImage, timeout);
-        }
-    }
-
-    private String getFirstExistingBackupPath(List<String> backupPaths) {
-        for (String backupPath : backupPaths) {
-            if (StringUtils.isNotBlank(backupPath) && Files.exists(Paths.get(backupPath))) {
-                return backupPath;
-            }
-        }
-        return backupPaths.get(0);
+    private boolean checkBackupFileImage(String backupPath) {
+        int exitValue = Script.runSimpleBashScriptForExitValue(String.format("qemu-img check %s", backupPath));
+        return exitValue == 0;
     }
 
-    private boolean replaceFileVolumeWithBackup(String volumePath, String backupPath, int timeout) {
-        QemuImgFile srcBackupFile = null;
-        QemuImgFile destVolumeFile = null;
-        try {
-            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
-            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
-            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
-            qemu.convert(srcBackupFile, destVolumeFile);
-            return true;
-        } catch (QemuImgException | LibvirtException e) {
-            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
-            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
-            logger.error("Failed to convert backup {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
-            return false;
-        }
+    private boolean checkBackupPathExists(String backupPath) {
+        int exitValue = Script.runSimpleBashScriptForExitValue(String.format("ls %s", backupPath));
+        return exitValue == 0;
     }
 
-    private boolean convertTemporaryRbdToFileVolume(String volumePath, int timeout, RbdImageSpec sourceImage, String tempImage) {
-        QemuImgFile srcBackupFile = null;
-        QemuImgFile destVolumeFile = null;
-        try {
-            QemuImg qemu = new QemuImg(timeout * 1000, true, false);
-            srcBackupFile = new QemuImgFile(sourceImage.buildQemuUri(tempImage), QemuImg.PhysicalDiskFormat.RAW);
-            destVolumeFile = new QemuImgFile(volumePath, getFileVolumeFormat(volumePath));
-            qemu.convert(srcBackupFile, destVolumeFile);
-            return true;
-        } catch (QemuImgException | LibvirtException e) {
-            String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : tempImage;
-            String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : volumePath;
-            logger.error("Failed to convert temporary RBD {} to volume {}, the error was: {}", srcFilename, destFilename, e.getMessage());
-            return false;
-        }
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout) {
+        return replaceVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPath, timeout, false);
     }
 
-    private QemuImg.PhysicalDiskFormat getBackupFileFormat(String backupPath) {
-        if (backupPath.endsWith(".raw")) {
-            return QemuImg.PhysicalDiskFormat.RAW;
+    private boolean replaceVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
+        if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
+            int exitValue = Script.runSimpleBashScriptForExitValue(String.format(RSYNC_COMMAND, backupPath, volumePath));
+            return exitValue == 0;
         }
-        return QemuImg.PhysicalDiskFormat.QCOW2;
-    }
 
-    private QemuImg.PhysicalDiskFormat getFileVolumeFormat(String volumePath) {
-        if (!Files.exists(Paths.get(volumePath))) {
-            return QemuImg.PhysicalDiskFormat.QCOW2;
-        }
-        try {
-            QemuImg qemu = new QemuImg(0);
-            Map<String, String> info = qemu.info(new QemuImgFile(volumePath));
-            String format = info.get("file_format");
-            if (StringUtils.isNotBlank(format)) {
-                return QemuImg.PhysicalDiskFormat.valueOf(format.toUpperCase(Locale.ROOT));
-            }
-        } catch (QemuImgException | LibvirtException | IllegalArgumentException e) {
-            logger.warn("Failed to detect file volume format for path {}. Falling back to qcow2.", volumePath, e);
-        }
-        return QemuImg.PhysicalDiskFormat.QCOW2;
+        return replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, volumePath, backupPath, timeout, createTargetVolume);
     }
 
-    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths, int timeout, boolean createTargetVolume) {
-        if (backupPaths.stream().anyMatch(path -> path.endsWith(".rbdiff"))) {
-            return restoreIncrementalRbdBackupChain(storagePoolMgr, volumePool, volumePath, backupPaths, timeout, createTargetVolume);
-        }
-
-        String backupPath = getFirstExistingBackupPath(backupPaths);
+    private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
         KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
-        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, volumeStoragePool);
-        if (getBackupFileFormat(backupPath) == QemuImg.PhysicalDiskFormat.RAW) {
-            return importRawBackupToRbd(volumeStoragePool, normalizedVolumePath, backupPath, timeout, createTargetVolume);
-        }
-
         QemuImg qemu;
         try {
             qemu = new QemuImg(timeout * 1000, true, false);
             if (!createTargetVolume) {
-                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(normalizedVolumePath);
+                KVMPhysicalDisk rdbDisk = volumeStoragePool.getPhysicalDisk(volumePath);
                 logger.debug("Restoring RBD volume: {}", rdbDisk.toString());
                 qemu.setSkipTargetVolumeCreation(true);
             }
@@ -366,13 +258,13 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         QemuImgFile srcBackupFile = null;
         QemuImgFile destVolumeFile = null;
         try {
-            srcBackupFile = new QemuImgFile(backupPath, getBackupFileFormat(backupPath));
-            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, normalizedVolumePath);
+            srcBackupFile = new QemuImgFile(backupPath, QemuImg.PhysicalDiskFormat.QCOW2);
+            String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
             destVolumeFile = new QemuImgFile(rbdDestVolumeFile, QemuImg.PhysicalDiskFormat.RAW);
 
-            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, normalizedVolumePath);
+            logger.debug("Starting convert backup  {} to RBD volume  {}", backupPath, volumePath);
             qemu.convert(srcBackupFile, destVolumeFile);
-            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, normalizedVolumePath);
+            logger.debug("Successfully converted backup {} to RBD volume  {}", backupPath, volumePath);
         } catch (QemuImgException | LibvirtException e) {
             String srcFilename = srcBackupFile != null ? srcBackupFile.getFileName() : null;
             String destFilename = destVolumeFile != null ? destVolumeFile.getFileName() : null;
@@ -383,392 +275,6 @@ private boolean replaceRbdVolumeWithBackup(KVMStoragePoolManager storagePoolMgr,
         return true;
     }
 
-    private boolean importRawBackupToRbd(KVMStoragePool volumeStoragePool, String volumePath, String backupPath, int timeout, boolean createTargetVolume) {
-        if (!createTargetVolume && !volumeStoragePool.deletePhysicalDisk(volumePath, Storage.ImageFormat.RAW)) {
-            logger.error("Failed to delete existing RBD volume {} before raw import", volumePath);
-            return false;
-        }
-
-        String importCommand = buildRbdImportCommand(volumeStoragePool, backupPath, volumePath);
-        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
-            logger.error("Failed to import raw backup {} into volume {}", backupPath, volumePath);
-            return false;
-        }
-        return true;
-    }
-
-    private boolean restoreIncrementalRbdBackupChain(KVMStoragePoolManager storagePoolMgr, PrimaryDataStoreTO volumePool, String volumePath, List<String> backupPaths,
-                                                     int timeout, boolean createTargetVolume) {
-        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
-            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
-        }
-
-        String normalizedVolumePath = normalizeRbdVolumePath(volumePath, storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid()));
-        if (!replaceRbdVolumeWithBackup(storagePoolMgr, volumePool, normalizedVolumePath, List.of(backupPaths.get(0)), timeout, createTargetVolume)) {
-            return false;
-        }
-
-        KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
-        List<String> restoreSnapshots = new ArrayList<>();
-        try {
-            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
-            String baseCheckpoint = baseMetadata.get("checkpoint_name");
-            if (StringUtils.isNotBlank(baseCheckpoint)) {
-                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, baseCheckpoint, timeout)) {
-                    return false;
-                }
-                restoreSnapshots.add(baseCheckpoint);
-            }
-
-            for (int index = 1; index < backupPaths.size(); index++) {
-                String backupPath = backupPaths.get(index);
-                if (!backupPath.endsWith(".rbdiff")) {
-                    continue;
-                }
-
-                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
-                String parentCheckpoint = metadata.get("parent_checkpoint_name");
-                String checkpoint = metadata.get("checkpoint_name");
-                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
-                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
-                }
-                if (!rbdSnapshotExists(volumeStoragePool, normalizedVolumePath, parentCheckpoint, timeout)) {
-                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on volume %s", parentCheckpoint, normalizedVolumePath));
-                }
-
-                String importDiffCommand = buildRbdImportDiffCommand(volumeStoragePool, backupPath, normalizedVolumePath);
-                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                    logger.error("Failed to import RBD diff {} into volume {}", backupPath, normalizedVolumePath);
-                    return false;
-                }
-
-                if (!ensureRbdSnapshotExists(volumeStoragePool, normalizedVolumePath, checkpoint, timeout)) {
-                    return false;
-                }
-                restoreSnapshots.add(checkpoint);
-            }
-            return true;
-        } finally {
-            cleanupRbdRestoreSnapshots(volumeStoragePool, normalizedVolumePath, restoreSnapshots, timeout);
-        }
-    }
-
-    private String normalizeRbdVolumePath(String volumePath, KVMStoragePool storagePool) {
-        if (StringUtils.isBlank(volumePath)) {
-            return volumePath;
-        }
-        String normalized = volumePath;
-        String poolPath = storagePool.getSourceDir();
-        if (StringUtils.isNotBlank(poolPath)) {
-            String poolPrefix = poolPath + "/";
-            if (normalized.startsWith(poolPrefix)) {
-                normalized = normalized.substring(poolPrefix.length());
-            }
-        }
-        if (normalized.startsWith("/")) {
-            normalized = normalized.substring(normalized.lastIndexOf('/') + 1);
-        }
-        return normalized;
-    }
-
-    private String buildRbdImportDiffCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
-        StringBuilder command = new StringBuilder("rbd");
-        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
-            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
-        }
-        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
-            command.append(" --id ").append(storagePool.getAuthUserName());
-        }
-        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
-            command.append(" --key ").append(storagePool.getAuthSecret());
-        }
-        command.append(" import-diff ").append(backupPath).append(" ").append(volumePath);
-        return command.toString();
-    }
-
-    private String buildRbdImportCommand(KVMStoragePool storagePool, String backupPath, String volumePath) {
-        StringBuilder command = new StringBuilder("rbd");
-        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
-            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
-        }
-        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
-            command.append(" --id ").append(storagePool.getAuthUserName());
-        }
-        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
-            command.append(" --key ").append(storagePool.getAuthSecret());
-        }
-        command.append(" import ").append(backupPath).append(" ").append(volumePath);
-        return command.toString();
-    }
-
-    private String formatRbdMonHosts(String hosts, int port) {
-        String[] hostValues = hosts.split(",");
-        List<String> formattedHosts = new ArrayList<>();
-        for (String host : hostValues) {
-            String normalizedHost = host.replace("[", "").replace("]", "").trim();
-            if (StringUtils.isBlank(normalizedHost)) {
-                continue;
-            }
-            formattedHosts.add(port > 0 ? normalizedHost + ":" + port : normalizedHost);
-        }
-        return String.join(",", formattedHosts);
-    }
-
-    private boolean importBackupChainToTemporaryRbd(List<String> backupPaths, int timeout, RbdImageSpec sourceImage, String tempImage) {
-        if (backupPaths.isEmpty() || !backupPaths.get(0).endsWith(".raw")) {
-            throw new CloudRuntimeException("Incremental RBD backup chain is missing the base full backup");
-        }
-        String importCommand = sourceImage.buildRbdCommand("import", quote(backupPaths.get(0)), quote(tempImage));
-        if (Script.runSimpleBashScriptForExitValue(importCommand, timeout * 1000, false) != 0) {
-            logger.error("Failed to import base RBD backup {} into temporary image {}", backupPaths.get(0), tempImage);
-            return false;
-        }
-
-        List<String> restoreSnapshots = new ArrayList<>();
-        try {
-            Map<String, String> baseMetadata = readRbdBackupMetadata(backupPaths.get(0));
-            String baseCheckpoint = baseMetadata.get("checkpoint_name");
-            if (StringUtils.isNotBlank(baseCheckpoint)) {
-                if (!ensureRbdSnapshotExists(sourceImage, tempImage, baseCheckpoint, timeout)) {
-                    return false;
-                }
-                restoreSnapshots.add(baseCheckpoint);
-            }
-
-            for (int index = 1; index < backupPaths.size(); index++) {
-                String backupPath = backupPaths.get(index);
-                if (!backupPath.endsWith(".rbdiff")) {
-                    continue;
-                }
-                Map<String, String> metadata = readRbdBackupMetadata(backupPath);
-                String parentCheckpoint = metadata.get("parent_checkpoint_name");
-                String checkpoint = metadata.get("checkpoint_name");
-                if (StringUtils.isBlank(parentCheckpoint) || StringUtils.isBlank(checkpoint)) {
-                    throw new CloudRuntimeException(String.format("RBD incremental backup metadata is incomplete for %s", backupPath));
-                }
-                if (!rbdSnapshotExists(sourceImage, tempImage, parentCheckpoint, timeout)) {
-                    throw new CloudRuntimeException(String.format("Required parent snapshot %s is missing on temporary image %s", parentCheckpoint, tempImage));
-                }
-                String importDiffCommand = sourceImage.buildRbdCommand("import-diff", quote(backupPath), quote(tempImage));
-                if (Script.runSimpleBashScriptForExitValue(importDiffCommand, timeout * 1000, false) != 0) {
-                    logger.error("Failed to import RBD diff {} into temporary image {}", backupPath, tempImage);
-                    return false;
-                }
-                if (!ensureRbdSnapshotExists(sourceImage, tempImage, checkpoint, timeout)) {
-                    return false;
-                }
-                restoreSnapshots.add(checkpoint);
-            }
-            return true;
-        } finally {
-            cleanupRbdRestoreSnapshots(sourceImage, tempImage, restoreSnapshots, timeout);
-        }
-    }
-
-    private Map<String, String> readRbdBackupMetadata(String backupPath) {
-        java.nio.file.Path metadataPath = Paths.get(backupPath).getParent().resolve("rbd-backup.meta");
-        if (!Files.exists(metadataPath)) {
-            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
-        }
-        try {
-            return Files.readAllLines(metadataPath).stream()
-                    .map(String::trim)
-                    .filter(line -> !line.isEmpty() && line.contains("="))
-                    .map(line -> line.split("=", 2))
-                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
-        } catch (IOException e) {
-            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
-        }
-    }
-
-    private boolean ensureRbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
-        if (rbdSnapshotExists(storagePool, volumePath, snapshotName, timeout)) {
-            return true;
-        }
-        String createSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap create", volumePath + "@" + snapshotName);
-        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
-            logger.error("Failed to create RBD snapshot {} on volume {}", snapshotName, volumePath);
-            return false;
-        }
-        return true;
-    }
-
-    private boolean ensureRbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
-        if (rbdSnapshotExists(imageSpec, image, snapshotName, timeout)) {
-            return true;
-        }
-        String createSnapshotCommand = imageSpec.buildRbdCommand("snap", "create", quote(image + "@" + snapshotName));
-        if (Script.runSimpleBashScriptForExitValue(createSnapshotCommand, timeout * 1000, false) != 0) {
-            logger.error("Failed to create RBD snapshot {} on image {}", snapshotName, image);
-            return false;
-        }
-        return true;
-    }
-
-    private boolean rbdSnapshotExists(KVMStoragePool storagePool, String volumePath, String snapshotName, int timeout) {
-        String existsCommand = buildRbdSnapshotCommand(storagePool, "snap ls", volumePath) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
-        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
-    }
-
-    private boolean rbdSnapshotExists(RbdImageSpec imageSpec, String image, String snapshotName, int timeout) {
-        String existsCommand = imageSpec.buildRbdCommand("snap", "ls", quote(image)) + " | awk 'NR>1 {print $2}' | grep -Fx " + quote(snapshotName);
-        return Script.runSimpleBashScriptForExitValue(existsCommand, timeout * 1000, false) == 0;
-    }
-
-    private void cleanupRbdRestoreSnapshots(KVMStoragePool storagePool, String volumePath, List<String> snapshotNames, int timeout) {
-        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
-            String snapshotName = snapshotNames.get(index);
-            String removeSnapshotCommand = buildRbdSnapshotCommand(storagePool, "snap rm", volumePath + "@" + snapshotName);
-            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
-        }
-    }
-
-    private void cleanupRbdRestoreSnapshots(RbdImageSpec imageSpec, String image, List<String> snapshotNames, int timeout) {
-        for (int index = snapshotNames.size() - 1; index >= 0; index--) {
-            String snapshotName = snapshotNames.get(index);
-            String removeSnapshotCommand = imageSpec.buildRbdCommand("snap", "rm", quote(image + "@" + snapshotName));
-            Script.runSimpleBashScriptForExitValue(removeSnapshotCommand, timeout * 1000, false);
-        }
-    }
-
-    private String buildRbdSnapshotCommand(KVMStoragePool storagePool, String action, String target) {
-        StringBuilder command = new StringBuilder("rbd");
-        if (StringUtils.isNotBlank(storagePool.getSourceHost())) {
-            command.append(" -m ").append(formatRbdMonHosts(storagePool.getSourceHost(), storagePool.getSourcePort()));
-        }
-        if (StringUtils.isNotBlank(storagePool.getAuthUserName())) {
-            command.append(" --id ").append(storagePool.getAuthUserName());
-        }
-        if (StringUtils.isNotBlank(storagePool.getAuthSecret())) {
-            command.append(" --key ").append(storagePool.getAuthSecret());
-        }
-        command.append(" ").append(action).append(" ").append(target);
-        return command.toString();
-    }
-
-    private void removeTemporaryRbdImage(RbdImageSpec sourceImage, String tempImage, int timeout) {
-        String removeCommand = sourceImage.buildRbdCommand("rm", quote(tempImage));
-        Script.runSimpleBashScriptForExitValue(removeCommand, timeout * 1000, false);
-    }
-
-    private RbdImageSpec getRbdImageSpecFromMetadata(String backupRootPath, int backupIndex) {
-        java.nio.file.Path metadataPath = Paths.get(backupRootPath, "rbd-backup.meta");
-        if (!Files.exists(metadataPath)) {
-            throw new CloudRuntimeException(String.format("RBD backup metadata file not found: %s", metadataPath));
-        }
-        try {
-            Map<String, String> metadata = Files.readAllLines(metadataPath).stream()
-                    .map(String::trim)
-                    .filter(line -> !line.isEmpty() && line.contains("="))
-                    .map(line -> line.split("=", 2))
-                    .collect(java.util.stream.Collectors.toMap(parts -> parts[0], parts -> parts[1], (left, right) -> right));
-            String diskPaths = metadata.get("disk_paths");
-            if (StringUtils.isBlank(diskPaths)) {
-                throw new CloudRuntimeException("RBD backup metadata does not contain disk_paths");
-            }
-            List<String> values = Arrays.asList(diskPaths.split(","));
-            if (backupIndex >= values.size()) {
-                throw new CloudRuntimeException(String.format("RBD backup metadata does not contain disk path for index %d", backupIndex));
-            }
-            return RbdImageSpec.fromUri(values.get(backupIndex));
-        } catch (IOException e) {
-            throw new CloudRuntimeException(String.format("Failed to read RBD backup metadata: %s", metadataPath), e);
-        }
-    }
-
-    private String quote(String value) {
-        return "'" + value.replace("'", "'\"'\"'") + "'";
-    }
-
-    private static final class RbdImageSpec {
-        private final String image;
-        private final String monHost;
-        private final String user;
-        private final String key;
-
-        private RbdImageSpec(String image, String monHost, String user, String key) {
-            this.image = image;
-            this.monHost = monHost;
-            this.user = user;
-            this.key = key;
-        }
-
-        private static RbdImageSpec fromUri(String uri) {
-            String image = null;
-            String monHost = null;
-            String user = null;
-            String key = null;
-            if (uri.startsWith("rbd:")) {
-                String payload = uri.substring("rbd:".length());
-                image = payload.contains(":") ? payload.substring(0, payload.indexOf(':')) : payload;
-                monHost = extract(uri, ":mon_host=([^:]*)");
-                if (monHost != null) {
-                    monHost = monHost.replace("\\;", ",").replace("\\:", ":");
-                }
-                user = extract(uri, ":id=([^:]*)");
-                key = extract(uri, ":key=([^:]*)");
-            } else if (uri.startsWith("rbd/")) {
-                image = uri;
-            }
-            if (StringUtils.isBlank(image)) {
-                throw new CloudRuntimeException(String.format("Unable to parse RBD disk path: %s", uri));
-            }
-            return new RbdImageSpec(image, monHost, user, key);
-        }
-
-        private static String extract(String value, String regex) {
-            java.util.regex.Matcher matcher = java.util.regex.Pattern.compile(regex).matcher(value);
-            return matcher.find() ? matcher.group(1) : null;
-        }
-
-        private String buildTempImageSpec() {
-            return String.format("%s-csrestore-%s", image, RandomStringUtils.randomAlphanumeric(8).toLowerCase(Locale.ROOT));
-        }
-
-        private String buildRbdCommand(String action, String source, String target) {
-            StringBuilder command = new StringBuilder("rbd");
-            if (StringUtils.isNotBlank(monHost)) {
-                command.append(" -m ").append(quoteArg(monHost));
-            }
-            if (StringUtils.isNotBlank(user)) {
-                command.append(" --id ").append(quoteArg(user));
-            }
-            if (StringUtils.isNotBlank(key)) {
-                command.append(" --key ").append(quoteArg(key));
-            }
-            command.append(" ").append(action);
-            if (StringUtils.isNotBlank(source)) {
-                command.append(" ").append(source);
-            }
-            if (StringUtils.isNotBlank(target)) {
-                command.append(" ").append(target);
-            }
-            return command.toString();
-        }
-
-        private String buildRbdCommand(String action, String target) {
-            return buildRbdCommand(action, null, target);
-        }
-
-        private String buildQemuUri(String imageSpec) {
-            StringBuilder uri = new StringBuilder("rbd:").append(imageSpec);
-            if (StringUtils.isNotBlank(monHost)) {
-                uri.append(":mon_host=").append(monHost.replace(",", "\\;"));
-            }
-            if (StringUtils.isNotBlank(user)) {
-                uri.append(":id=").append(user);
-            }
-            if (StringUtils.isNotBlank(key)) {
-                uri.append(":key=").append(key);
-            }
-            return uri.toString();
-        }
-
-        private String quoteArg(String value) {
-            return "'" + value.replace("'", "'\"'\"'") + "'";
-        }
-    }
-
     private boolean attachVolumeToVm(KVMStoragePoolManager storagePoolMgr, String vmName, PrimaryDataStoreTO volumePool, String volumePath, String cacheMode) {
         String deviceToAttachDiskTo = getDeviceToAttachDisk(vmName);
         int exitValue;
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
index b954f8804edc..11fa605908a6 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
@@ -19,41 +19,93 @@
 
 package com.cloud.hypervisor.kvm.resource.wrapper;
 
+import com.amazonaws.util.CollectionUtils;
 import com.cloud.agent.api.Answer;
 import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
+import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
 import com.cloud.resource.CommandWrapper;
 import com.cloud.resource.ResourceWrapper;
+import com.cloud.storage.Storage;
 import com.cloud.utils.Pair;
+import com.cloud.utils.script.Script;
 import org.apache.cloudstack.backup.BackupAnswer;
 import org.apache.cloudstack.backup.TakeBackupCommand;
+import org.apache.cloudstack.storage.to.PrimaryDataStoreTO;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 @ResourceWrapper(handles = TakeBackupCommand.class)
 public class LibvirtTakeBackupCommandWrapper extends CommandWrapper<TakeBackupCommand, Answer, LibvirtComputingResource> {
+    private static final Integer EXIT_CLEANUP_FAILED = 20;
     @Override
     public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
-        logger.info("LibvirtTakeBackupCommandWrapper entering execute for vm=[{}], backupPath=[{}], backupType=[{}]",
-                command.getVmName(), command.getBackupPath(), command.getBackupType());
-        LibvirtNasBackupHelper backupHelper = new LibvirtNasBackupHelper(libvirtComputingResource);
-        List<String> diskPaths = backupHelper.resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
-        logger.info("LibvirtTakeBackupCommandWrapper invoking helper for vm=[{}], diskPaths=[{}]",
-                command.getVmName(), diskPaths);
-        Pair<Integer, String> result = backupHelper.executeBackup(command);
-        logger.info("LibvirtTakeBackupCommandWrapper helper returned for vm=[{}], resultCode=[{}], details=[{}]",
-                command.getVmName(), result.first(), result.second());
+        final String vmName = command.getVmName();
+        final String backupPath = command.getBackupPath();
+        final String backupRepoType = command.getBackupRepoType();
+        final String backupRepoAddress = command.getBackupRepoAddress();
+        final String mountOptions = command.getMountOptions();
+        List<PrimaryDataStoreTO> volumePools = command.getVolumePools();
+        final List<String> volumePaths = command.getVolumePaths();
+        KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();
+
+        List<String> diskPaths = new ArrayList<>();
+        if (Objects.nonNull(volumePaths)) {
+            for (int idx = 0; idx < volumePaths.size(); idx++) {
+                PrimaryDataStoreTO volumePool = volumePools.get(idx);
+                String volumePath = volumePaths.get(idx);
+                if (volumePool.getPoolType() != Storage.StoragePoolType.RBD) {
+                    diskPaths.add(volumePath);
+                } else {
+                    KVMStoragePool volumeStoragePool = storagePoolMgr.getStoragePool(volumePool.getPoolType(), volumePool.getUuid());
+                    String rbdDestVolumeFile = KVMPhysicalDisk.RBDStringBuilder(volumeStoragePool, volumePath);
+                    diskPaths.add(rbdDestVolumeFile);
+                }
+            }
+        }
+
+        List<String[]> commands = new ArrayList<>();
+        commands.add(new String[]{
+                libvirtComputingResource.getNasBackupPath(),
+                "-o", "backup",
+                "-v", vmName,
+                "-t", backupRepoType,
+                "-s", backupRepoAddress,
+                "-m", Objects.nonNull(mountOptions) ? mountOptions : "",
+                "-p", backupPath,
+                "-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
+                "-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
+        });
+
+        Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
 
         if (result.first() != 0) {
             logger.debug("Failed to take VM backup: " + result.second());
             BackupAnswer answer = new BackupAnswer(command, false, result.second().trim());
-            if (result.first() == LibvirtNasBackupHelper.EXIT_CLEANUP_FAILED) {
+            if (result.first() == EXIT_CLEANUP_FAILED) {
                 logger.debug("Backup cleanup failed");
                 answer.setNeedsCleanup(true);
             }
             return answer;
         }
 
-        long backupSize = backupHelper.parseBackupSize(result.second(), diskPaths);
+        long backupSize = 0L;
+        if (CollectionUtils.isNullOrEmpty(diskPaths)) {
+            List<String> outputLines = Arrays.asList(result.second().trim().split("\n"));
+            if (!outputLines.isEmpty()) {
+                backupSize = Long.parseLong(outputLines.get(outputLines.size() - 1).trim());
+            }
+        } else {
+            String[] outputLines = result.second().trim().split("\n");
+            for(String line : outputLines) {
+                backupSize = backupSize + Long.parseLong(line.split(" ")[0].trim());
+            }
+        }
+
         BackupAnswer answer = new BackupAnswer(command, true, result.second().trim());
         answer.setSize(backupSize);
         return answer;
diff --git a/scripts/vm/hypervisor/kvm/cvtbackup.sh b/scripts/vm/hypervisor/kvm/ablestack_cvtbackup.sh
similarity index 91%
rename from scripts/vm/hypervisor/kvm/cvtbackup.sh
rename to scripts/vm/hypervisor/kvm/ablestack_cvtbackup.sh
index 35d5b1c3a562..b1139039c241 100644
--- a/scripts/vm/hypervisor/kvm/cvtbackup.sh
+++ b/scripts/vm/hypervisor/kvm/ablestack_cvtbackup.sh
@@ -1,7 +1,30 @@
 #!/usr/bin/bash
 
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 set -eo pipefail
 
+# CloudStack B&R Commvault Backup and Recovery Tool for KVM
+
+# TODO: do libvirt/logging etc checks
+
+### Declare variables ###
+
 OP=""
 VM=""
 BACKUP_DIR=""
@@ -409,7 +432,7 @@ fi
 dest="$BACKUP_DIR"
 sanity_checks
 
-log -ne "cvtbackup.sh start op=[$OP] vm=[$VM] backupDir=[$BACKUP_DIR] backupType=[$BACKUP_TYPE] checkpoint=[$CHECKPOINT_NAME] parentBackup=[$PARENT_BACKUP_DIR] parentCheckpoint=[$PARENT_CHECKPOINT_NAME] diskPaths=[$DISK_PATHS] backupFiles=[$BACKUP_FILES]"
+log -ne "ablestack_cvtbackup.sh start op=[$OP] vm=[$VM] backupDir=[$BACKUP_DIR] backupType=[$BACKUP_TYPE] checkpoint=[$CHECKPOINT_NAME] parentBackup=[$PARENT_BACKUP_DIR] parentCheckpoint=[$PARENT_CHECKPOINT_NAME] diskPaths=[$DISK_PATHS] backupFiles=[$BACKUP_FILES]"
 
 if [[ "$OP" == "backup-running" ]]; then
   backup_running_vm
diff --git a/scripts/vm/hypervisor/kvm/ablestack_nasbackup.sh b/scripts/vm/hypervisor/kvm/ablestack_nasbackup.sh
new file mode 100755
index 000000000000..1960720ec7a9
--- /dev/null
+++ b/scripts/vm/hypervisor/kvm/ablestack_nasbackup.sh
@@ -0,0 +1,626 @@
+#!/usr/bin/bash
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+set -eo pipefail
+
+# CloudStack B&R NAS Backup and Recovery Tool for KVM
+
+# TODO: do libvirt/logging etc checks
+
+### Declare variables ###
+
+OP=""
+VM=""
+NAS_TYPE=""
+NAS_ADDRESS=""
+MOUNT_OPTS=""
+BACKUP_DIR=""
+BACKUP_TYPE=""
+CHECKPOINT_NAME=""
+PARENT_BACKUP_DIR=""
+PARENT_CHECKPOINT_NAME=""
+PARENT_CHECKPOINT_PATH=""
+BACKUP_FILES=""
+DISK_PATHS=""
+QUIESCE=""
+FORCED="false"
+logFile="/var/log/cloudstack/agent/agent.log"
+
+EXIT_CLEANUP_FAILED=20
+
+log() {
+  [[ "$verb" -eq 1 ]] && builtin echo "$@"
+  if [[ "$1" == "-ne"  || "$1" == "-e" || "$1" == "-n" ]]; then
+    builtin echo -e "$(date '+%Y-%m-%d %H-%M-%S>')" "${@: 2}" >> "$logFile"
+  else
+    builtin echo "$(date '+%Y-%m-%d %H-%M-%S>')" "$@" >> "$logFile"
+  fi
+}
+
+vercomp() {
+  local IFS=.
+  local i ver1=($1) ver2=($3)
+
+  # Compare each segment of the version numbers
+  for ((i=0; i<${#ver1[@]}; i++)); do
+      if [[ -z ${ver2[i]} ]]; then
+          ver2[i]=0
+      fi
+
+      if ((10#${ver1[i]} > 10#${ver2[i]})); then
+          return  0 # Version 1 is greater
+      elif ((10#${ver1[i]} < 10#${ver2[i]})); then
+          return 2  # Version 2 is greater
+      fi
+  done
+  return 0  # Versions are equal
+}
+
+sanity_checks() {
+  hvVersion=$(virsh version | grep hypervisor | awk '{print $(NF)}')
+  libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1)
+  apiVersion=$(virsh version | grep API | awk '{print $(NF)}')
+
+  vercomp "$hvVersion" ">=" "4.2.0"
+  hvStatus=$?
+  vercomp "$libvVersion" ">=" "7.2.0"
+  libvStatus=$?
+
+  if [[ $hvStatus -eq 0 && $libvStatus -eq 0 ]]; then
+    log -ne "Success... [ QEMU: $hvVersion Libvirt: $libvVersion apiVersion: $apiVersion ]"
+  else
+    echo "Failure... Your QEMU version $hvVersion or libvirt version $libvVersion is unsupported. Consider upgrading to the required minimum version of QEMU: 4.2.0 and Libvirt: 7.2.0"
+    exit 1
+  fi
+}
+
+### Operation methods ###
+
+backup_running_vm() {
+  mount_operation
+  mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
+  mkdir -p "$dest/checkpoints" || { echo "Failed to create checkpoint directory $dest/checkpoints"; exit 1; }
+
+  local parent_checkpoint_file=""
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
+    parent_checkpoint_file="$mount_point/$PARENT_CHECKPOINT_PATH"
+    redefine_checkpoint_if_needed "$VM" "$parent_checkpoint_file"
+  fi
+
+  echo "<domainbackup mode='push'>" > "$dest/backup.xml"
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+    echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$dest/backup.xml"
+  fi
+  echo "<disks>" >> "$dest/backup.xml"
+  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$dest/checkpoint.xml"
+  local index=0
+  while IFS='|' read -r disk target; do
+    [[ -z "$disk" ]] && continue
+    local backup_file
+    backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
+    echo "<disk name='$disk' backup='yes' type='file'><target file='$dest/$backup_file' /><driver type='qcow2'/></disk>" >> "$dest/backup.xml"
+    echo "<disk name='$disk' checkpoint='bitmap'/>" >> "$dest/checkpoint.xml"
+    index=$((index + 1))
+  done < <(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
+  echo "</disks></domainbackup>" >> "$dest/backup.xml"
+  echo "</disks></domaincheckpoint>" >> "$dest/checkpoint.xml"
+
+  local thaw=0
+  if [[ ${QUIESCE} == "true" ]]; then
+    if virsh -c qemu:///system qemu-agent-command "$VM" '{"execute":"guest-fsfreeze-freeze"}' > /dev/null 2>/dev/null; then
+      thaw=1
+    fi
+  fi
+
+  # Start push backup
+  local backup_begin=0
+  if virsh -c qemu:///system backup-begin --domain "$VM" --backupxml "$dest/backup.xml" --checkpointxml "$dest/checkpoint.xml" 2>&1 > /dev/null; then
+    backup_begin=1;
+  fi
+
+  if [[ $thaw -eq 1 ]]; then
+    if ! response=$(virsh -c qemu:///system qemu-agent-command "$VM" '{"execute":"guest-fsfreeze-thaw"}' 2>&1 > /dev/null); then
+      echo "Failed to thaw the filesystem for vm $VM: $response"
+      cleanup
+      exit 1
+    fi
+  fi
+
+  if [[ $backup_begin -ne 1 ]]; then
+    cleanup
+    exit 1
+  fi
+
+  backup_domain_information "$VM"
+
+  while true; do
+    status=$(virsh -c qemu:///system domjobinfo "$VM" --completed --keep-completed | awk '/Job type:/ {print $3}')
+    case "$status" in
+      Completed)
+        break ;;
+      Failed)
+        echo "Virsh backup job failed"
+        cleanup ;;
+    esac
+    sleep 5
+  done
+
+  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
+    local index=0
+    while IFS='|' read -r disk target; do
+      [[ -z "$disk" ]] && continue
+      local backup_file
+      backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
+      output="$dest/$backup_file"
+      parent="../$(basename "$PARENT_BACKUP_DIR")/$backup_file"
+      if ! qemu-img rebase -u -F qcow2 -b "$parent" "$output" > "$logFile" 2> >(cat >&2); then
+        echo "qemu-img rebase failed for $output with parent $parent"
+        cleanup
+      fi
+      index=$((index + 1))
+    done < <(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
+  fi
+
+  dump_checkpoint_xml "$VM"
+  rm -f "$dest/backup.xml"
+  rm -f "$dest/checkpoint.xml"
+  sync
+
+  # Print statistics
+  virsh -c qemu:///system domjobinfo "$VM" --completed
+  du -sb "$dest" | cut -f1
+
+  umount "$mount_point"
+  rmdir "$mount_point"
+}
+
+backup_rbd_volumes() {
+  log -ne "Entered backup_rbd_volumes with DISK_PATHS=[$DISK_PATHS], BACKUP_FILES=[$BACKUP_FILES], BACKUP_DIR=[$BACKUP_DIR]"
+  mount_operation
+  mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
+
+  backup_domain_information "$VM"
+
+  local index=0
+  while IFS= read -r disk; do
+    local created_snapshot=""
+    log -ne "Loop disk raw value=[$disk]"
+    [[ -z "$disk" ]] && continue
+
+    parse_rbd_uri "$disk"
+    log -ne "Parsed disk [$disk] -> RBD_IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
+
+    if [[ -z "$RBD_IMAGE" ]]; then
+      echo "Unable to parse RBD disk path: $disk"
+      cleanup
+    fi
+
+    build_rbd_cmd
+    log -ne "Built RBD command: ${RBD_CMD[*]}"
+
+    local backup_file
+    backup_file=$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")
+    local output="$dest/$backup_file"
+    local current_snapshot="${CHECKPOINT_NAME}"
+
+    log -ne "Resolved backup file [$backup_file], destination [$output]"
+    log -ne "Starting RBD backup for disk path [$disk], resolved image [$RBD_IMAGE], output [$output]"
+
+    if ! timeout 30s "${RBD_CMD[@]}" info "$RBD_IMAGE" >> "$logFile" 2>&1; then
+      echo "Failed to access RBD image $RBD_IMAGE"
+      cleanup
+    fi
+
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      if ! timeout 30s "${RBD_CMD[@]}" snap ls "$RBD_IMAGE" 2>>"$logFile" | awk 'NR>1 {print $2}' | grep -Fxq "$PARENT_CHECKPOINT_NAME"; then
+        echo "Parent RBD snapshot ${RBD_IMAGE}@${PARENT_CHECKPOINT_NAME} not found for incremental backup"
+        cleanup
+      fi
+    fi
+
+    if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
+      echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
+      cleanup
+    fi
+    created_snapshot="${RBD_IMAGE}@${current_snapshot}"
+
+    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
+      if ! timeout 6h "${RBD_CMD[@]}" export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
+        echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${current_snapshot}"
+        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
+        cleanup
+      fi
+    else
+      if ! timeout 6h "${RBD_CMD[@]}" export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
+        echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
+        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
+        cleanup
+      fi
+    fi
+
+    log -ne "Finished exporting backup file [$output] size=[$(stat -c %s "$output" 2>/dev/null)]"
+    stat -c %s "$output"
+    index=$((index + 1))
+  done < <(split_csv "$DISK_PATHS")
+
+  write_rbd_backup_metadata "$BACKUP_TYPE" "$CHECKPOINT_NAME" "$PARENT_CHECKPOINT_NAME"
+
+  sync
+  log -ne "RBD backup completed checkpoint=[$CHECKPOINT_NAME] parent=[$PARENT_CHECKPOINT_NAME]"
+  umount "$mount_point"
+  rmdir "$mount_point"
+}
+
+backup_domain_information() {
+  local vm_name="$1"
+
+  [[ -z "$vm_name" ]] && return 0
+
+  mkdir -p "$dest/checkpoints" || {
+    echo "Failed to create checkpoint directory $dest/checkpoints"
+    exit 1
+  }
+
+  if virsh -c qemu:///system dominfo "$vm_name" > /dev/null 2>&1; then
+    virsh -c qemu:///system dumpxml "$vm_name" > "$dest/domain-config.xml" 2>/dev/null || true
+    virsh -c qemu:///system dominfo "$vm_name" > "$dest/dominfo.xml" 2>/dev/null || true
+    virsh -c qemu:///system domiflist "$vm_name" > "$dest/domiflist.xml" 2>/dev/null || true
+    virsh -c qemu:///system domblklist "$vm_name" > "$dest/domblklist.xml" 2>/dev/null || true
+
+    if [[ -n "$CHECKPOINT_NAME" ]]; then
+      cat > "$dest/checkpoints/$CHECKPOINT_NAME.meta" <<EOF
+checkpoint_name=$CHECKPOINT_NAME
+backup_type=$BACKUP_TYPE
+vm_name=$vm_name
+disk_paths=$DISK_PATHS
+backup_files=$BACKUP_FILES
+EOF
+    fi
+
+    log -ne "Backed up domain information for VM [$vm_name]"
+  else
+    log -ne "VM [$vm_name] not found in libvirt; skipped domain metadata backup"
+  fi
+}
+
+has_child_backup() {
+  local checkpoint_name="$1"
+
+  [[ -z "$checkpoint_name" ]] && return 1
+
+  grep -R -q "^parent_checkpoint_name=$checkpoint_name$" "$mount_point"/*/rbd-backup.meta 2>/dev/null
+}
+
+delete_rbd_snapshot_if_unreferenced() {
+  local disk_paths="$1"
+  local checkpoint_name="$2"
+
+  [[ -z "$checkpoint_name" ]] && return 0
+
+  if has_child_backup "$checkpoint_name"; then
+    log -ne "Skip snapshot delete [$checkpoint_name] (child exists)"
+    return 0
+  fi
+
+  while IFS= read -r disk; do
+    [[ -z "$disk" ]] && continue
+    parse_rbd_uri "$disk"
+    build_rbd_cmd
+
+    if [[ -n "$RBD_IMAGE" ]]; then
+      log -ne "Deleting snapshot [${RBD_IMAGE}@${checkpoint_name}]"
+      "${RBD_CMD[@]}" snap rm "${RBD_IMAGE}@${checkpoint_name}" >> "$logFile" 2>&1 || true
+    fi
+  done < <(split_csv "$disk_paths")
+}
+
+delete_backup() {
+  mount_operation
+
+  if [[ -f "$dest/rbd-backup.meta" ]]; then
+    source "$dest/rbd-backup.meta"
+
+    log -ne "Deleting backup with metadata [$dest]"
+
+    if [[ "$FORCED" != "true" ]] && has_child_backup "$checkpoint_name"; then
+      echo "Cannot delete backup [$backup_dir]: child backup exists"
+      umount "$mount_point"
+      rmdir "$mount_point"
+      exit 1
+    fi
+
+    delete_rbd_snapshot_if_unreferenced "$disk_paths" "$checkpoint_name"
+  elif [[ -n "$CHECKPOINT_NAME" && -n "$DISK_PATHS" ]]; then
+    log -ne "Deleting backup using command metadata [$dest]"
+    delete_rbd_snapshot_if_unreferenced "$DISK_PATHS" "$CHECKPOINT_NAME"
+  fi
+
+  rm -frv $dest
+  sync
+  umount $mount_point
+  rmdir $mount_point
+}
+
+get_backup_stats() {
+  mount_operation
+
+  echo $mount_point
+  df -P $mount_point 2>/dev/null | awk 'NR==2 {print $2, $3}'
+  umount $mount_point
+  rmdir $mount_point
+}
+
+mount_operation() {
+  mount_point=$(mktemp -d -t csbackup.XXXXX)
+  dest="$mount_point/${BACKUP_DIR}"
+  if [ ${NAS_TYPE} == "cifs" ]; then
+    MOUNT_OPTS="${MOUNT_OPTS},nobrl"
+  fi
+  mount -t ${NAS_TYPE} ${NAS_ADDRESS} ${mount_point} $([[ ! -z "${MOUNT_OPTS}" ]] && echo -o ${MOUNT_OPTS}) 2>&1 | tee -a "$logFile"
+  if [ $? -eq 0 ]; then
+      log -ne "Successfully mounted ${NAS_TYPE} store"
+  else
+      echo "Failed to mount ${NAS_TYPE} store"
+      exit 1
+  fi
+}
+
+cleanup() {
+  local status=0
+
+  rm -rf "$dest" || { echo "Failed to delete $dest"; status=1; }
+  umount "$mount_point" || { echo "Failed to unmount $mount_point"; status=1; }
+  rmdir "$mount_point" || { echo "Failed to remove mount point $mount_point"; status=1; }
+
+  if [[ $status -ne 0 ]]; then
+    echo "Backup cleanup failed"
+    exit $EXIT_CLEANUP_FAILED
+  fi
+}
+
+split_csv() {
+  tr ',' '\n' <<< "$1"
+}
+
+is_rbd_disk_path() {
+  local disk_path="$1"
+  [[ "$disk_path" == rbd:* || "$disk_path" == rbd/* ]]
+}
+
+get_backup_file_by_index() {
+  local index="$1"
+  local fallback="$2"
+  if [[ -z "$BACKUP_FILES" ]]; then
+    echo "$fallback"
+    return
+  fi
+  local current=0
+  while IFS= read -r value; do
+    if [[ "$current" -eq "$index" ]]; then
+      echo "$value"
+      return
+    fi
+    current=$((current + 1))
+  done < <(split_csv "$BACKUP_FILES")
+  echo "$fallback"
+}
+
+dump_checkpoint_xml() {
+  local vm_name="$1"
+  if [[ -n "$CHECKPOINT_NAME" ]]; then
+    virsh -c qemu:///system checkpoint-dumpxml --domain "$vm_name" --checkpointname "$CHECKPOINT_NAME" --no-domain > "$dest/checkpoints/$CHECKPOINT_NAME.xml" 2>/dev/null || true
+  fi
+}
+
+redefine_checkpoint_if_needed() {
+  local vm_name="$1"
+  local checkpoint_file="$2"
+  if [[ -z "$PARENT_CHECKPOINT_NAME" || -z "$checkpoint_file" || ! -f "$checkpoint_file" ]]; then
+    return
+  fi
+  if virsh -c qemu:///system checkpoint-info --domain "$vm_name" --checkpointname "$PARENT_CHECKPOINT_NAME" > /dev/null 2>&1; then
+    return
+  fi
+  if ! virsh -c qemu:///system checkpoint-create --domain "$vm_name" --xmlfile "$checkpoint_file" --redefine > /dev/null 2>&1; then
+    echo "Failed to redefine checkpoint $PARENT_CHECKPOINT_NAME on domain $vm_name"
+    cleanup
+  fi
+}
+
+parse_rbd_uri() {
+  local uri="$1"
+  log -ne "parse_rbd_uri called with uri=[$uri]"
+
+  RBD_IMAGE=""
+  RBD_MON_HOST=""
+  RBD_USER=""
+  RBD_KEY=""
+
+  if [[ "$uri" == rbd:* ]]; then
+    local payload="${uri#rbd:}"
+    RBD_IMAGE="${payload%%:*}"
+
+    if [[ "$uri" =~ :mon_host=([^:]*) ]]; then
+      RBD_MON_HOST="${BASH_REMATCH[1]}"
+      RBD_MON_HOST="${RBD_MON_HOST//\\;/,}"
+      RBD_MON_HOST="${RBD_MON_HOST//\\:/:}"
+    fi
+
+    if [[ "$uri" =~ :id=([^:]*) ]]; then
+      RBD_USER="${BASH_REMATCH[1]}"
+    fi
+
+    if [[ "$uri" =~ :key=([^:]*) ]]; then
+      RBD_KEY="${BASH_REMATCH[1]}"
+    fi
+  elif [[ "$uri" == rbd/* ]]; then
+    RBD_IMAGE="$uri"
+  else
+    echo "Invalid RBD disk path: $uri"
+    cleanup
+  fi
+
+  if [[ -z "$RBD_IMAGE" ]]; then
+    echo "Failed to parse RBD image from uri: $uri"
+    cleanup
+  fi
+
+  log -ne "Parsed RBD uri -> IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
+}
+
+build_rbd_cmd() {
+  RBD_CMD=(rbd)
+  if [[ -n "$RBD_MON_HOST" ]]; then
+    RBD_CMD+=(-m "$RBD_MON_HOST")
+  fi
+  if [[ -n "$RBD_USER" ]]; then
+    RBD_CMD+=(--id "$RBD_USER")
+  fi
+  if [[ -n "$RBD_KEY" ]]; then
+    RBD_CMD+=(--key "$RBD_KEY")
+  fi
+}
+
+write_rbd_backup_metadata() {
+  local backup_type="$1"
+  local checkpoint_name="$2"
+  local parent_checkpoint_name="$3"
+
+  cat > "$dest/rbd-backup.meta" <<EOF
+vm_name=$VM
+backup_type=$backup_type
+checkpoint_name=$checkpoint_name
+parent_checkpoint_name=$parent_checkpoint_name
+disk_paths=$DISK_PATHS
+backup_files=$BACKUP_FILES
+backup_dir=$BACKUP_DIR
+EOF
+
+  log -ne "Wrote RBD backup metadata to [$dest/rbd-backup.meta]"
+}
+
+function usage {
+  echo ""
+  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false> -x|--forced <true|false>"
+  echo ""
+  exit 1
+}
+
+while [[ $# -gt 0 ]]; do
+  case $1 in
+    -o|--operation)
+      OP="$2"
+      shift
+      shift
+      ;;
+    -v|--vm)
+      VM="$2"
+      shift
+      shift
+      ;;
+    -t|--type)
+      NAS_TYPE="$2"
+      shift
+      shift
+      ;;
+    -s|--storage)
+      NAS_ADDRESS="$2"
+      shift
+      shift
+      ;;
+    -m|--mount)
+      MOUNT_OPTS="$2"
+      shift
+      shift
+      ;;
+    -p|--path)
+      BACKUP_DIR="$2"
+      shift
+      shift
+      ;;
+    -b|--backuptype)
+      BACKUP_TYPE="$2"
+      shift
+      shift
+      ;;
+    -c|--checkpoint)
+      CHECKPOINT_NAME="$2"
+      shift
+      shift
+      ;;
+    -r|--parentpath)
+      PARENT_BACKUP_DIR="$2"
+      shift
+      shift
+      ;;
+    -i|--parentcheckpoint)
+      PARENT_CHECKPOINT_NAME="$2"
+      shift
+      shift
+      ;;
+    -j|--parentcheckpointpath)
+      PARENT_CHECKPOINT_PATH="$2"
+      shift
+      shift
+      ;;
+    -f|--backupfiles)
+      BACKUP_FILES="$2"
+      shift
+      shift
+      ;;
+    -q|--quiesce)
+      QUIESCE="$2"
+      shift
+      shift
+      ;;
+    -x|--forced)
+      FORCED="$2"
+      shift
+      shift
+      ;;
+    -d|--diskpaths)
+      DISK_PATHS="$2"
+      shift
+      shift
+      ;;
+    -h|--help)
+      usage
+      shift
+      ;;
+    *)
+      echo "Invalid option: $1"
+      usage
+      ;;
+  esac
+done
+
+# Perform Initial sanity checks
+sanity_checks
+
+log -ne "nasbackup.sh start op=[$OP] vm=[$VM] backupDir=[$BACKUP_DIR] backupType=[$BACKUP_TYPE] checkpoint=[$CHECKPOINT_NAME] parentBackup=[$PARENT_BACKUP_DIR] parentCheckpoint=[$PARENT_CHECKPOINT_NAME] diskPaths=[$DISK_PATHS] backupFiles=[$BACKUP_FILES]"
+
+if [ "$OP" = "backup-running" ]; then
+  backup_running_vm
+elif [ "$OP" = "backup-rbd" ]; then
+  backup_rbd_volumes
+elif [ "$OP" = "delete" ]; then
+  delete_backup
+elif [ "$OP" = "stats" ]; then
+  get_backup_stats
+fi
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 1960720ec7a9..4550333c6658 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -1,3 +1,4 @@
+
 #!/usr/bin/bash
 
 # Licensed to the Apache Software Foundation (ASF) under one
@@ -31,15 +32,8 @@ NAS_TYPE=""
 NAS_ADDRESS=""
 MOUNT_OPTS=""
 BACKUP_DIR=""
-BACKUP_TYPE=""
-CHECKPOINT_NAME=""
-PARENT_BACKUP_DIR=""
-PARENT_CHECKPOINT_NAME=""
-PARENT_CHECKPOINT_PATH=""
-BACKUP_FILES=""
 DISK_PATHS=""
 QUIESCE=""
-FORCED="false"
 logFile="/var/log/cloudstack/agent/agent.log"
 
 EXIT_CLEANUP_FAILED=20
@@ -77,8 +71,11 @@ sanity_checks() {
   libvVersion=$(virsh version | grep libvirt | awk '{print $(NF)}' | tail -n 1)
   apiVersion=$(virsh version | grep API | awk '{print $(NF)}')
 
+  # Compare qemu version (hvVersion >= 4.2.0)
   vercomp "$hvVersion" ">=" "4.2.0"
   hvStatus=$?
+
+  # Compare libvirt version (libvVersion >= 7.2.0)
   vercomp "$libvVersion" ">=" "7.2.0"
   libvStatus=$?
 
@@ -88,6 +85,8 @@ sanity_checks() {
     echo "Failure... Your QEMU version $hvVersion or libvirt version $libvVersion is unsupported. Consider upgrading to the required minimum version of QEMU: 4.2.0 and Libvirt: 7.2.0"
     exit 1
   fi
+
+  log -ne "Environment Sanity Checks successfully passed"
 }
 
 ### Operation methods ###
@@ -95,31 +94,15 @@ sanity_checks() {
 backup_running_vm() {
   mount_operation
   mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
-  mkdir -p "$dest/checkpoints" || { echo "Failed to create checkpoint directory $dest/checkpoints"; exit 1; }
-
-  local parent_checkpoint_file=""
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_PATH" ]]; then
-    parent_checkpoint_file="$mount_point/$PARENT_CHECKPOINT_PATH"
-    redefine_checkpoint_if_needed "$VM" "$parent_checkpoint_file"
-  fi
 
-  echo "<domainbackup mode='push'>" > "$dest/backup.xml"
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-    echo "<incremental>$PARENT_CHECKPOINT_NAME</incremental>" >> "$dest/backup.xml"
-  fi
-  echo "<disks>" >> "$dest/backup.xml"
-  echo "<domaincheckpoint><name>$CHECKPOINT_NAME</name><disks>" > "$dest/checkpoint.xml"
-  local index=0
-  while IFS='|' read -r disk target; do
-    [[ -z "$disk" ]] && continue
-    local backup_file
-    backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
-    echo "<disk name='$disk' backup='yes' type='file'><target file='$dest/$backup_file' /><driver type='qcow2'/></disk>" >> "$dest/backup.xml"
-    echo "<disk name='$disk' checkpoint='bitmap'/>" >> "$dest/checkpoint.xml"
-    index=$((index + 1))
-  done < <(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
-  echo "</disks></domainbackup>" >> "$dest/backup.xml"
-  echo "</disks></domaincheckpoint>" >> "$dest/checkpoint.xml"
+  name="root"
+  echo "<domainbackup mode='push'><disks>" > $dest/backup.xml
+  for disk in $(virsh -c qemu:///system domblklist $VM --details 2>/dev/null | awk '/disk/{print$3}'); do
+    volpath=$(virsh -c qemu:///system domblklist $VM --details | awk "/$disk/{print $4}" | sed 's/.*\///')
+    echo "<disk name='$disk' backup='yes' type='file' backupmode='full'><driver type='qcow2'/><target file='$dest/$name.$volpath.qcow2' /></disk>" >> $dest/backup.xml
+    name="datadisk"
+  done
+  echo "</disks></domainbackup>" >> $dest/backup.xml
 
   local thaw=0
   if [[ ${QUIESCE} == "true" ]]; then
@@ -130,7 +113,7 @@ backup_running_vm() {
 
   # Start push backup
   local backup_begin=0
-  if virsh -c qemu:///system backup-begin --domain "$VM" --backupxml "$dest/backup.xml" --checkpointxml "$dest/checkpoint.xml" 2>&1 > /dev/null; then
+  if virsh -c qemu:///system backup-begin --domain $VM --backupxml $dest/backup.xml 2>&1 > /dev/null; then
     backup_begin=1;
   fi
 
@@ -147,10 +130,14 @@ backup_running_vm() {
     exit 1
   fi
 
-  backup_domain_information "$VM"
+  # Backup domain information
+  virsh -c qemu:///system dumpxml $VM > $dest/domain-config.xml 2>/dev/null
+  virsh -c qemu:///system dominfo $VM > $dest/dominfo.xml 2>/dev/null
+  virsh -c qemu:///system domiflist $VM > $dest/domiflist.xml 2>/dev/null
+  virsh -c qemu:///system domblklist $VM > $dest/domblklist.xml 2>/dev/null
 
   while true; do
-    status=$(virsh -c qemu:///system domjobinfo "$VM" --completed --keep-completed | awk '/Job type:/ {print $3}')
+    status=$(virsh -c qemu:///system domjobinfo $VM --completed --keep-completed | awk '/Job type:/ {print $3}')
     case "$status" in
       Completed)
         break ;;
@@ -161,196 +148,48 @@ backup_running_vm() {
     sleep 5
   done
 
-  if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_BACKUP_DIR" ]]; then
-    local index=0
-    while IFS='|' read -r disk target; do
-      [[ -z "$disk" ]] && continue
-      local backup_file
-      backup_file=$(get_backup_file_by_index "$index" "$(basename "$target").qcow2")
-      output="$dest/$backup_file"
-      parent="../$(basename "$PARENT_BACKUP_DIR")/$backup_file"
-      if ! qemu-img rebase -u -F qcow2 -b "$parent" "$output" > "$logFile" 2> >(cat >&2); then
-        echo "qemu-img rebase failed for $output with parent $parent"
-        cleanup
-      fi
-      index=$((index + 1))
-    done < <(virsh -c qemu:///system domblklist "$VM" --details 2>/dev/null | awk '/disk/ {print $3 "|" $4}')
-  fi
-
-  dump_checkpoint_xml "$VM"
-  rm -f "$dest/backup.xml"
-  rm -f "$dest/checkpoint.xml"
+  rm -f $dest/backup.xml
   sync
 
   # Print statistics
-  virsh -c qemu:///system domjobinfo "$VM" --completed
-  du -sb "$dest" | cut -f1
+  virsh -c qemu:///system domjobinfo $VM --completed
+  du -sb $dest | cut -f1
 
-  umount "$mount_point"
-  rmdir "$mount_point"
+  umount $mount_point
+  rmdir $mount_point
 }
 
-backup_rbd_volumes() {
-  log -ne "Entered backup_rbd_volumes with DISK_PATHS=[$DISK_PATHS], BACKUP_FILES=[$BACKUP_FILES], BACKUP_DIR=[$BACKUP_DIR]"
+backup_stopped_vm() {
   mount_operation
   mkdir -p "$dest" || { echo "Failed to create backup directory $dest"; exit 1; }
 
-  backup_domain_information "$VM"
-
-  local index=0
-  while IFS= read -r disk; do
-    local created_snapshot=""
-    log -ne "Loop disk raw value=[$disk]"
-    [[ -z "$disk" ]] && continue
-
-    parse_rbd_uri "$disk"
-    log -ne "Parsed disk [$disk] -> RBD_IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
-
-    if [[ -z "$RBD_IMAGE" ]]; then
-      echo "Unable to parse RBD disk path: $disk"
-      cleanup
-    fi
-
-    build_rbd_cmd
-    log -ne "Built RBD command: ${RBD_CMD[*]}"
-
-    local backup_file
-    backup_file=$(get_backup_file_by_index "$index" "${RBD_IMAGE##*/}.raw")
-    local output="$dest/$backup_file"
-    local current_snapshot="${CHECKPOINT_NAME}"
-
-    log -ne "Resolved backup file [$backup_file], destination [$output]"
-    log -ne "Starting RBD backup for disk path [$disk], resolved image [$RBD_IMAGE], output [$output]"
+  IFS=","
 
-    if ! timeout 30s "${RBD_CMD[@]}" info "$RBD_IMAGE" >> "$logFile" 2>&1; then
-      echo "Failed to access RBD image $RBD_IMAGE"
-      cleanup
-    fi
-
-    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      if ! timeout 30s "${RBD_CMD[@]}" snap ls "$RBD_IMAGE" 2>>"$logFile" | awk 'NR>1 {print $2}' | grep -Fxq "$PARENT_CHECKPOINT_NAME"; then
-        echo "Parent RBD snapshot ${RBD_IMAGE}@${PARENT_CHECKPOINT_NAME} not found for incremental backup"
-        cleanup
-      fi
+  name="root"
+  for disk in $DISK_PATHS; do
+    if [[ "$disk" == rbd:* ]]; then
+      # disk for rbd => rbd:<pool>/<uuid>:mon_host=<monitor_host>...
+      # sample: rbd:cloudstack/53d5c355-d726-4d3e-9422-046a503a0b12:mon_host=10.0.1.2...
+      beforeUuid="${disk#*/}"     # Remove up to first slash after rbd:
+      volUuid="${beforeUuid%%:*}" # Remove everything after colon to get the uuid
+    else
+      volUuid="${disk##*/}"
     fi
-
-    if ! timeout 30s "${RBD_CMD[@]}" snap create "${RBD_IMAGE}@${current_snapshot}" >> "$logFile" 2>&1; then
-      echo "Failed to create RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
+    output="$dest/$name.$volUuid.qcow2"
+    if ! qemu-img convert -O qcow2 "$disk" "$output" > "$logFile" 2> >(cat >&2); then
+      echo "qemu-img convert failed for $disk $output"
       cleanup
     fi
-    created_snapshot="${RBD_IMAGE}@${current_snapshot}"
-
-    if [[ "$BACKUP_TYPE" == "INCREMENTAL" && -n "$PARENT_CHECKPOINT_NAME" ]]; then
-      if ! timeout 6h "${RBD_CMD[@]}" export-diff --from-snap "$PARENT_CHECKPOINT_NAME" "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
-        echo "Failed to export incremental RBD diff for ${RBD_IMAGE}@${current_snapshot}"
-        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
-        cleanup
-      fi
-    else
-      if ! timeout 6h "${RBD_CMD[@]}" export "${RBD_IMAGE}@${current_snapshot}" "$output" >> "$logFile" 2>&1; then
-        echo "Failed to export full RBD snapshot ${RBD_IMAGE}@${current_snapshot}"
-        [[ -n "$created_snapshot" ]] && "${RBD_CMD[@]}" snap rm "$created_snapshot" >> "$logFile" 2>&1 || true
-        cleanup
-      fi
-    fi
-
-    log -ne "Finished exporting backup file [$output] size=[$(stat -c %s "$output" 2>/dev/null)]"
-    stat -c %s "$output"
-    index=$((index + 1))
-  done < <(split_csv "$DISK_PATHS")
-
-  write_rbd_backup_metadata "$BACKUP_TYPE" "$CHECKPOINT_NAME" "$PARENT_CHECKPOINT_NAME"
-
+    name="datadisk"
+  done
   sync
-  log -ne "RBD backup completed checkpoint=[$CHECKPOINT_NAME] parent=[$PARENT_CHECKPOINT_NAME]"
-  umount "$mount_point"
-  rmdir "$mount_point"
-}
-
-backup_domain_information() {
-  local vm_name="$1"
-
-  [[ -z "$vm_name" ]] && return 0
-
-  mkdir -p "$dest/checkpoints" || {
-    echo "Failed to create checkpoint directory $dest/checkpoints"
-    exit 1
-  }
-
-  if virsh -c qemu:///system dominfo "$vm_name" > /dev/null 2>&1; then
-    virsh -c qemu:///system dumpxml "$vm_name" > "$dest/domain-config.xml" 2>/dev/null || true
-    virsh -c qemu:///system dominfo "$vm_name" > "$dest/dominfo.xml" 2>/dev/null || true
-    virsh -c qemu:///system domiflist "$vm_name" > "$dest/domiflist.xml" 2>/dev/null || true
-    virsh -c qemu:///system domblklist "$vm_name" > "$dest/domblklist.xml" 2>/dev/null || true
-
-    if [[ -n "$CHECKPOINT_NAME" ]]; then
-      cat > "$dest/checkpoints/$CHECKPOINT_NAME.meta" <<EOF
-checkpoint_name=$CHECKPOINT_NAME
-backup_type=$BACKUP_TYPE
-vm_name=$vm_name
-disk_paths=$DISK_PATHS
-backup_files=$BACKUP_FILES
-EOF
-    fi
-
-    log -ne "Backed up domain information for VM [$vm_name]"
-  else
-    log -ne "VM [$vm_name] not found in libvirt; skipped domain metadata backup"
-  fi
-}
-
-has_child_backup() {
-  local checkpoint_name="$1"
-
-  [[ -z "$checkpoint_name" ]] && return 1
-
-  grep -R -q "^parent_checkpoint_name=$checkpoint_name$" "$mount_point"/*/rbd-backup.meta 2>/dev/null
-}
-
-delete_rbd_snapshot_if_unreferenced() {
-  local disk_paths="$1"
-  local checkpoint_name="$2"
-
-  [[ -z "$checkpoint_name" ]] && return 0
-
-  if has_child_backup "$checkpoint_name"; then
-    log -ne "Skip snapshot delete [$checkpoint_name] (child exists)"
-    return 0
-  fi
-
-  while IFS= read -r disk; do
-    [[ -z "$disk" ]] && continue
-    parse_rbd_uri "$disk"
-    build_rbd_cmd
 
-    if [[ -n "$RBD_IMAGE" ]]; then
-      log -ne "Deleting snapshot [${RBD_IMAGE}@${checkpoint_name}]"
-      "${RBD_CMD[@]}" snap rm "${RBD_IMAGE}@${checkpoint_name}" >> "$logFile" 2>&1 || true
-    fi
-  done < <(split_csv "$disk_paths")
+  ls -l --numeric-uid-gid $dest | awk '{print $5}'
 }
 
 delete_backup() {
   mount_operation
 
-  if [[ -f "$dest/rbd-backup.meta" ]]; then
-    source "$dest/rbd-backup.meta"
-
-    log -ne "Deleting backup with metadata [$dest]"
-
-    if [[ "$FORCED" != "true" ]] && has_child_backup "$checkpoint_name"; then
-      echo "Cannot delete backup [$backup_dir]: child backup exists"
-      umount "$mount_point"
-      rmdir "$mount_point"
-      exit 1
-    fi
-
-    delete_rbd_snapshot_if_unreferenced "$disk_paths" "$checkpoint_name"
-  elif [[ -n "$CHECKPOINT_NAME" && -n "$DISK_PATHS" ]]; then
-    log -ne "Deleting backup using command metadata [$dest]"
-    delete_rbd_snapshot_if_unreferenced "$DISK_PATHS" "$CHECKPOINT_NAME"
-  fi
-
   rm -frv $dest
   sync
   umount $mount_point
@@ -394,130 +233,9 @@ cleanup() {
   fi
 }
 
-split_csv() {
-  tr ',' '\n' <<< "$1"
-}
-
-is_rbd_disk_path() {
-  local disk_path="$1"
-  [[ "$disk_path" == rbd:* || "$disk_path" == rbd/* ]]
-}
-
-get_backup_file_by_index() {
-  local index="$1"
-  local fallback="$2"
-  if [[ -z "$BACKUP_FILES" ]]; then
-    echo "$fallback"
-    return
-  fi
-  local current=0
-  while IFS= read -r value; do
-    if [[ "$current" -eq "$index" ]]; then
-      echo "$value"
-      return
-    fi
-    current=$((current + 1))
-  done < <(split_csv "$BACKUP_FILES")
-  echo "$fallback"
-}
-
-dump_checkpoint_xml() {
-  local vm_name="$1"
-  if [[ -n "$CHECKPOINT_NAME" ]]; then
-    virsh -c qemu:///system checkpoint-dumpxml --domain "$vm_name" --checkpointname "$CHECKPOINT_NAME" --no-domain > "$dest/checkpoints/$CHECKPOINT_NAME.xml" 2>/dev/null || true
-  fi
-}
-
-redefine_checkpoint_if_needed() {
-  local vm_name="$1"
-  local checkpoint_file="$2"
-  if [[ -z "$PARENT_CHECKPOINT_NAME" || -z "$checkpoint_file" || ! -f "$checkpoint_file" ]]; then
-    return
-  fi
-  if virsh -c qemu:///system checkpoint-info --domain "$vm_name" --checkpointname "$PARENT_CHECKPOINT_NAME" > /dev/null 2>&1; then
-    return
-  fi
-  if ! virsh -c qemu:///system checkpoint-create --domain "$vm_name" --xmlfile "$checkpoint_file" --redefine > /dev/null 2>&1; then
-    echo "Failed to redefine checkpoint $PARENT_CHECKPOINT_NAME on domain $vm_name"
-    cleanup
-  fi
-}
-
-parse_rbd_uri() {
-  local uri="$1"
-  log -ne "parse_rbd_uri called with uri=[$uri]"
-
-  RBD_IMAGE=""
-  RBD_MON_HOST=""
-  RBD_USER=""
-  RBD_KEY=""
-
-  if [[ "$uri" == rbd:* ]]; then
-    local payload="${uri#rbd:}"
-    RBD_IMAGE="${payload%%:*}"
-
-    if [[ "$uri" =~ :mon_host=([^:]*) ]]; then
-      RBD_MON_HOST="${BASH_REMATCH[1]}"
-      RBD_MON_HOST="${RBD_MON_HOST//\\;/,}"
-      RBD_MON_HOST="${RBD_MON_HOST//\\:/:}"
-    fi
-
-    if [[ "$uri" =~ :id=([^:]*) ]]; then
-      RBD_USER="${BASH_REMATCH[1]}"
-    fi
-
-    if [[ "$uri" =~ :key=([^:]*) ]]; then
-      RBD_KEY="${BASH_REMATCH[1]}"
-    fi
-  elif [[ "$uri" == rbd/* ]]; then
-    RBD_IMAGE="$uri"
-  else
-    echo "Invalid RBD disk path: $uri"
-    cleanup
-  fi
-
-  if [[ -z "$RBD_IMAGE" ]]; then
-    echo "Failed to parse RBD image from uri: $uri"
-    cleanup
-  fi
-
-  log -ne "Parsed RBD uri -> IMAGE=[$RBD_IMAGE], MON=[$RBD_MON_HOST], USER=[$RBD_USER]"
-}
-
-build_rbd_cmd() {
-  RBD_CMD=(rbd)
-  if [[ -n "$RBD_MON_HOST" ]]; then
-    RBD_CMD+=(-m "$RBD_MON_HOST")
-  fi
-  if [[ -n "$RBD_USER" ]]; then
-    RBD_CMD+=(--id "$RBD_USER")
-  fi
-  if [[ -n "$RBD_KEY" ]]; then
-    RBD_CMD+=(--key "$RBD_KEY")
-  fi
-}
-
-write_rbd_backup_metadata() {
-  local backup_type="$1"
-  local checkpoint_name="$2"
-  local parent_checkpoint_name="$3"
-
-  cat > "$dest/rbd-backup.meta" <<EOF
-vm_name=$VM
-backup_type=$backup_type
-checkpoint_name=$checkpoint_name
-parent_checkpoint_name=$parent_checkpoint_name
-disk_paths=$DISK_PATHS
-backup_files=$BACKUP_FILES
-backup_dir=$BACKUP_DIR
-EOF
-
-  log -ne "Wrote RBD backup metadata to [$dest/rbd-backup.meta]"
-}
-
 function usage {
   echo ""
-  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -b <FULL|INCREMENTAL> -c <checkpoint name> -r <parent backup path> -i <parent checkpoint name> -j <parent checkpoint path> -f <backup files> -d <disks path> -q|--quiesce <true|false> -x|--forced <true|false>"
+  echo "Usage: $0 -o <operation> -v|--vm <domain name> -t <storage type> -s <storage address> -m <mount options> -p <backup path> -d <disks path> -q|--quiesce <true|false>"
   echo ""
   exit 1
 }
@@ -554,46 +272,11 @@ while [[ $# -gt 0 ]]; do
       shift
       shift
       ;;
-    -b|--backuptype)
-      BACKUP_TYPE="$2"
-      shift
-      shift
-      ;;
-    -c|--checkpoint)
-      CHECKPOINT_NAME="$2"
-      shift
-      shift
-      ;;
-    -r|--parentpath)
-      PARENT_BACKUP_DIR="$2"
-      shift
-      shift
-      ;;
-    -i|--parentcheckpoint)
-      PARENT_CHECKPOINT_NAME="$2"
-      shift
-      shift
-      ;;
-    -j|--parentcheckpointpath)
-      PARENT_CHECKPOINT_PATH="$2"
-      shift
-      shift
-      ;;
-    -f|--backupfiles)
-      BACKUP_FILES="$2"
-      shift
-      shift
-      ;;
     -q|--quiesce)
       QUIESCE="$2"
       shift
       shift
       ;;
-    -x|--forced)
-      FORCED="$2"
-      shift
-      shift
-      ;;
     -d|--diskpaths)
       DISK_PATHS="$2"
       shift
@@ -613,12 +296,13 @@ done
 # Perform Initial sanity checks
 sanity_checks
 
-log -ne "nasbackup.sh start op=[$OP] vm=[$VM] backupDir=[$BACKUP_DIR] backupType=[$BACKUP_TYPE] checkpoint=[$CHECKPOINT_NAME] parentBackup=[$PARENT_BACKUP_DIR] parentCheckpoint=[$PARENT_CHECKPOINT_NAME] diskPaths=[$DISK_PATHS] backupFiles=[$BACKUP_FILES]"
-
-if [ "$OP" = "backup-running" ]; then
-  backup_running_vm
-elif [ "$OP" = "backup-rbd" ]; then
-  backup_rbd_volumes
+if [ "$OP" = "backup" ]; then
+  STATE=$(virsh -c qemu:///system list | awk -v vm="$VM" '$2 == vm {print $3}')
+  if [ -n "$STATE" ] && [ "$STATE" = "running" ]; then
+    backup_running_vm
+  else
+    backup_stopped_vm
+  fi
 elif [ "$OP" = "delete" ]; then
   delete_backup
 elif [ "$OP" = "stats" ]; then

From cf7257ddada92f4c23c10a249f56a2bbb8675ca1 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 14:47:09 +0900
Subject: [PATCH 79/93] Update AblestackCommvaultRestoreBackupCommand.java

---
 .../backup/AblestackCommvaultRestoreBackupCommand.java        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java
index 31e60c32eaba..1ab9a8d2fe4d 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultRestoreBackupCommand.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-public class CommvaultRestoreBackupCommand extends Command  {
+public class AblestackCommvaultRestoreBackupCommand extends Command  {
     private String vmName;
     private String backupPath;
     private List<String> backupVolumesUUIDs;
@@ -43,7 +43,7 @@ public class CommvaultRestoreBackupCommand extends Command  {
     private String hostName;
     private List<String> backupSourceHosts;
 
-    protected CommvaultRestoreBackupCommand() {
+    protected AblestackCommvaultRestoreBackupCommand() {
         super();
     }
 

From cc8248102f27f70f30f407195e80cbc5ce3194ad Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 14:49:34 +0900
Subject: [PATCH 80/93] =?UTF-8?q?pom=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/backup/ablestack-commvault/pom.xml | 2 +-
 plugins/backup/ablestack-nas/pom.xml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/backup/ablestack-commvault/pom.xml b/plugins/backup/ablestack-commvault/pom.xml
index 55a8a3a0bfec..6b622e7a5a6e 100644
--- a/plugins/backup/ablestack-commvault/pom.xml
+++ b/plugins/backup/ablestack-commvault/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>cloud-plugin-backup-commvault</artifactId>
+    <artifactId>cloud-plugin-backup-ablestack-commvault</artifactId>
     <name>Ablestack Plugin - KVM Commvault Backup and Recovery Plugin</name>
     <parent>
         <artifactId>cloudstack-plugins</artifactId>
diff --git a/plugins/backup/ablestack-nas/pom.xml b/plugins/backup/ablestack-nas/pom.xml
index 1f81dc673eb1..97ed28f479aa 100644
--- a/plugins/backup/ablestack-nas/pom.xml
+++ b/plugins/backup/ablestack-nas/pom.xml
@@ -20,7 +20,7 @@
 <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>cloud-plugin-backup-nas</artifactId>
+    <artifactId>cloud-plugin-backup-ablestack-nas</artifactId>
     <name>Ablestack Plugin - KVM NAS Backup and Recovery Plugin</name>
     <parent>
         <artifactId>cloudstack-plugins</artifactId>

From 4467f5beb61ff30c95b02ec81b20b0a7426c68ca Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 14:50:57 +0900
Subject: [PATCH 81/93] =?UTF-8?q?=EC=9E=AC=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resource/wrapper/LibvirtRestoreBackupCommandWrapper.java    | 2 +-
 scripts/vm/hypervisor/kvm/nasbackup.sh                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
index 8a28f0df48df..85300afeec24 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java
@@ -338,4 +338,4 @@ private String getXmlForRbdDisk(KVMStoragePoolManager storagePoolMgr, PrimaryDat
         diskBuilder.append("</disk>\n");
         return diskBuilder.toString();
     }
-}
+}
\ No newline at end of file
diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh
index 4550333c6658..7f4a4b621929 100755
--- a/scripts/vm/hypervisor/kvm/nasbackup.sh
+++ b/scripts/vm/hypervisor/kvm/nasbackup.sh
@@ -1,4 +1,3 @@
-
 #!/usr/bin/bash
 
 # Licensed to the Apache Software Foundation (ASF) under one

From 0ce28d227363e05f08ced8b12ebb463fbe547f2d Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 14:57:55 +0900
Subject: [PATCH 82/93] =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../META-INF/cloudstack/commvault/module.properties         | 2 +-
 .../wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java | 2 +-
 .../LibvirtAblestackNasTakeBackupCommandWrapper.java        | 6 +++---
 plugins/pom.xml                                             | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
index 1db48b423de7..f0fddd257164 100644
--- a/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
+++ b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-name=commvault
+name=ablestack-commvault
 parent=backup
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
index 8355d0c366f8..f27e299935f5 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
@@ -66,7 +66,7 @@ public Answer execute(AblestackDeleteBackupCommand command, LibvirtComputingReso
             commands.add(deleteCommand.toArray(new String[0]));
         } else {
             List<String> deleteCommand = new ArrayList<>();
-            deleteCommand.add(libvirtComputingResource.getNasBackupPath());
+            deleteCommand.add(libvirtComputingResource.getAbleNasBackupPath());
             deleteCommand.add("-o");
             deleteCommand.add("delete");
             deleteCommand.add("-t");
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java
index a954efd74ec3..2293b8d4e824 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasTakeBackupCommandWrapper.java
@@ -30,12 +30,12 @@
 import java.util.List;
 
 @ResourceWrapper(handles = AblestackNasTakeBackupCommand.class)
-public class LibvirtAblestackTakeBackupCommandWrapper extends CommandWrapper<AblestackNasTakeBackupCommand, Answer, LibvirtComputingResource> {
+public class LibvirtAblestackNasTakeBackupCommandWrapper extends CommandWrapper<AblestackNasTakeBackupCommand, Answer, LibvirtComputingResource> {
     @Override
     public Answer execute(AblestackNasTakeBackupCommand command, LibvirtComputingResource libvirtComputingResource) {
         logger.info("LibvirtTakeBackupCommandWrapper entering execute for vm=[{}], backupPath=[{}], backupType=[{}]",
                 command.getVmName(), command.getBackupPath(), command.getBackupType());
-        LibvirtNasBackupHelper backupHelper = new LibvirtNasBackupHelper(libvirtComputingResource);
+        LibvirtAblestackNasBackupHelper backupHelper = new LibvirtAblestackNasBackupHelper(libvirtComputingResource);
         List<String> diskPaths = backupHelper.resolveDiskPaths(command.getVolumePools(), command.getVolumePaths());
         logger.info("LibvirtTakeBackupCommandWrapper invoking helper for vm=[{}], diskPaths=[{}]",
                 command.getVmName(), diskPaths);
@@ -46,7 +46,7 @@ public Answer execute(AblestackNasTakeBackupCommand command, LibvirtComputingRes
         if (result.first() != 0) {
             logger.debug("Failed to take VM backup: " + result.second());
             BackupAnswer answer = new BackupAnswer(command, false, result.second().trim());
-            if (result.first() == LibvirtNasBackupHelper.EXIT_CLEANUP_FAILED) {
+            if (result.first() == LibvirtAblestackNasBackupHelper.EXIT_CLEANUP_FAILED) {
                 logger.debug("Backup cleanup failed");
                 answer.setNeedsCleanup(true);
             }
diff --git a/plugins/pom.xml b/plugins/pom.xml
index f6537a107b9b..f7d4643c3446 100755
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -63,7 +63,8 @@
         <module>backup/dummy</module>
         <module>backup/networker</module>
         <module>backup/nas</module>
-        <module>backup/commvault</module>
+        <module>backup/ablestack-nas</module>
+        <module>backup/ablestack-commvault</module>
 
         <module>ca/root-ca</module>
 

From c83796d34c4e3665aa71d0ec5cb3edfa44d16a55 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 15:15:05 +0900
Subject: [PATCH 83/93] =?UTF-8?q?nas=20=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20ab?=
 =?UTF-8?q?lestack-nas=20=EC=86=8C=EC=8A=A4=20=ED=83=80=EB=8F=84=EB=A1=9D?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/backup/ListBackupProvidersCmd.java  |  6 +-
 .../backup/ListBackupProvidersForZoneCmd.java |  3 +-
 .../backup/BackupProviderNameUtils.java       | 63 +++++++++++++++++++
 .../backup/dao/BackupOfferingDaoImpl.java     |  5 +-
 .../AblestackCommvaultBackupProvider.java     |  2 +-
 .../backup/AblestackNasBackupProvider.java    |  2 +-
 ...rtAblestackDeleteBackupCommandWrapper.java |  2 +-
 .../cloudstack/backup/BackupManagerImpl.java  | 47 ++++++++++----
 ui/src/utils/plugins.js                       |  2 +-
 ui/src/views/compute/StartBackup.vue          |  2 +-
 10 files changed, 113 insertions(+), 21 deletions(-)
 create mode 100644 api/src/main/java/org/apache/cloudstack/backup/BackupProviderNameUtils.java

diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
index 17575076444d..974a4533ff97 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
@@ -30,6 +30,7 @@
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.BackupProvider;
+import org.apache.cloudstack.backup.BackupProviderNameUtils;
 
 import com.cloud.user.Account;
 
@@ -70,11 +71,12 @@ private void setupResponse(final List<BackupProvider> providers) {
         final ListResponse<BackupProviderResponse> response = new ListResponse<>();
         final List<BackupProviderResponse> responses = new ArrayList<>();
         for (final BackupProvider provider : providers) {
-            if (provider == null || (getName() != null && !provider.getName().equals(getName()))) {
+            final String displayName = provider == null ? null : BackupProviderNameUtils.toDisplayName(provider.getName());
+            if (provider == null || (getName() != null && !displayName.equalsIgnoreCase(getName()))) {
                 continue;
             }
             final BackupProviderResponse backupProviderResponse = new BackupProviderResponse();
-            backupProviderResponse.setName(provider.getName());
+            backupProviderResponse.setName(displayName);
             backupProviderResponse.setDescription(provider.getDescription());
             backupProviderResponse.setObjectName("providers");
             responses.add(backupProviderResponse);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersForZoneCmd.java
index 8d4fa8eba502..7f16fa42bdc3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersForZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersForZoneCmd.java
@@ -31,6 +31,7 @@
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.BackupProvider;
+import org.apache.cloudstack.backup.BackupProviderNameUtils;
 
 import com.cloud.user.Account;
 
@@ -75,7 +76,7 @@ private void setupResponse(final List<BackupProvider> providers) {
                 continue;
             }
             final BackupProviderResponse backupProviderResponse = new BackupProviderResponse();
-            backupProviderResponse.setName(provider.getName());
+            backupProviderResponse.setName(BackupProviderNameUtils.toDisplayName(provider.getName()));
             backupProviderResponse.setDescription(provider.getDescription());
             backupProviderResponse.setObjectName("providers");
             responses.add(backupProviderResponse);
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupProviderNameUtils.java b/api/src/main/java/org/apache/cloudstack/backup/BackupProviderNameUtils.java
new file mode 100644
index 000000000000..9788398cc3d4
--- /dev/null
+++ b/api/src/main/java/org/apache/cloudstack/backup/BackupProviderNameUtils.java
@@ -0,0 +1,63 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.backup;
+
+import org.apache.commons.lang3.StringUtils;
+
+public final class BackupProviderNameUtils {
+    public static final String NAS = "nas";
+    public static final String COMMVAULT = "commvault";
+    public static final String ABLESTACK_NAS = "ablestack-nas";
+    public static final String ABLESTACK_COMMVAULT = "ablestack-commvault";
+
+    private BackupProviderNameUtils() {
+    }
+
+    public static String canonicalize(final String providerName) {
+        if (StringUtils.isBlank(providerName)) {
+            return providerName;
+        }
+        if (NAS.equalsIgnoreCase(providerName) || ABLESTACK_NAS.equalsIgnoreCase(providerName)) {
+            return ABLESTACK_NAS;
+        }
+        if (COMMVAULT.equalsIgnoreCase(providerName) || ABLESTACK_COMMVAULT.equalsIgnoreCase(providerName)) {
+            return ABLESTACK_COMMVAULT;
+        }
+        return providerName;
+    }
+
+    public static String toDisplayName(final String providerName) {
+        if (StringUtils.isBlank(providerName)) {
+            return providerName;
+        }
+        if (ABLESTACK_NAS.equalsIgnoreCase(providerName) || NAS.equalsIgnoreCase(providerName)) {
+            return NAS;
+        }
+        if (ABLESTACK_COMMVAULT.equalsIgnoreCase(providerName) || COMMVAULT.equalsIgnoreCase(providerName)) {
+            return COMMVAULT;
+        }
+        return providerName;
+    }
+
+    public static boolean isNasFamily(final String providerName) {
+        return ABLESTACK_NAS.equalsIgnoreCase(canonicalize(providerName));
+    }
+
+    public static boolean isCommvaultFamily(final String providerName) {
+        return ABLESTACK_COMMVAULT.equalsIgnoreCase(canonicalize(providerName));
+    }
+}
diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java
index de79e8c18e1f..4ba41f9e3569 100644
--- a/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java
+++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupOfferingDaoImpl.java
@@ -24,6 +24,7 @@
 import com.cloud.domain.dao.DomainDao;
 import org.apache.cloudstack.api.response.BackupOfferingResponse;
 import org.apache.cloudstack.backup.BackupOffering;
+import org.apache.cloudstack.backup.BackupProviderNameUtils;
 import org.apache.cloudstack.backup.BackupOfferingVO;
 
 import com.cloud.dc.DataCenterVO;
@@ -67,7 +68,7 @@ public BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering,
         response.setName(offering.getName());
         response.setDescription(offering.getDescription());
         response.setExternalId(offering.getExternalId());
-        response.setProvider(offering.getProvider());
+        response.setProvider(BackupProviderNameUtils.toDisplayName(offering.getProvider()));
         response.setUserDrivenBackups(offering.isUserDrivenBackupAllowed());
         if (zone != null) {
             response.setZoneId(zone.getUuid());
@@ -91,7 +92,7 @@ public BackupOfferingResponse newBackupOfferingResponse(BackupOffering offering,
         if (offering.getRetentionPeriod() != null) {
             response.setRetentionPeriod(offering.getRetentionPeriod());
         }
-        response.setProvider(offering.getProvider());
+        response.setProvider(BackupProviderNameUtils.toDisplayName(offering.getProvider()));
         response.setCreated(offering.getCreated());
         response.setObjectName("backupoffering");
         return response;
diff --git a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
index fcbc5a050248..a36bf26256d8 100644
--- a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
@@ -1593,7 +1593,7 @@ private void cleanupBackupPathOnStageHost(String clientName, String path, boolea
             throw new CloudRuntimeException(String.format("Unable to find stage host [%s] for backup cleanup", clientName));
         }
         AblestackDeleteBackupCommand command = new AblestackDeleteBackupCommand(path, null, null, null, forced);
-        command.setBackupProvider("commvault");
+        command.setBackupProvider("ablestack-commvault");
         command.setCheckpointName(checkpointName);
         command.setDiskPaths(diskPaths);
         try {
diff --git a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
index c037e287030e..88554847e5d1 100644
--- a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
+++ b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
@@ -870,7 +870,7 @@ public boolean deleteBackup(Backup backup, boolean forced) {
 
         AblestackDeleteBackupCommand command = new AblestackDeleteBackupCommand(backup.getExternalId(), backupRepository.getType(),
                 backupRepository.getAddress(), backupRepository.getMountOptions(), forced);
-        command.setBackupProvider("nas");
+        command.setBackupProvider("ablestack-nas");
         command.setCheckpointName(getBackupDetail(backup, DETAIL_CHECKPOINT_NAME));
         command.setDiskPaths(getBackupDetail(backup, DETAIL_RBD_DISK_PATHS));
 
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
index f27e299935f5..7355a4bf56e7 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackDeleteBackupCommandWrapper.java
@@ -46,7 +46,7 @@ public Answer execute(AblestackDeleteBackupCommand command, LibvirtComputingReso
         final boolean forced = command.isForced();
 
         List<String[]> commands = new ArrayList<>();
-        if ("commvault".equalsIgnoreCase(backupProvider)) {
+        if ("ablestack-commvault".equalsIgnoreCase(backupProvider)) {
             List<String> deleteCommand = new ArrayList<>();
             deleteCommand.add(libvirtComputingResource.getAbleCvtBackupPath());
             deleteCommand.add("-o");
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 427858eb0055..68d801c3c4f7 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -67,6 +67,7 @@
 import org.apache.cloudstack.api.command.user.backup.repository.UpdateBackupRepositoryCmd;
 import org.apache.cloudstack.api.command.user.vm.CreateVMFromBackupCmd;
 import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.BackupProviderNameUtils;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupDetailsDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDao;
@@ -272,9 +273,10 @@ public List<BackupOffering> listBackupProviderOfferings(final Long zoneId, final
         }
         List<BackupOffering> allOfferings = new ArrayList<>();
         List<BackupProvider> providers = getBackupProvidersForZone(zoneId);
+        final String canonicalProviderName = BackupProviderNameUtils.canonicalize(providerName);
 
         for (BackupProvider provider : providers) {
-            if (provider.getName().equalsIgnoreCase(providerName)) {
+            if (provider.getName().equalsIgnoreCase(canonicalProviderName)) {
                 try {
                     logger.debug("Listing external backup offerings for provider {} in zone {}", provider.getName(), zoneId);
                     List<BackupOffering> offerings = provider.listBackupOfferings(zoneId);
@@ -294,7 +296,7 @@ public List<BackupOffering> listBackupProviderOfferings(final Long zoneId, final
     public BackupOffering importBackupOffering(final ImportBackupOfferingCmd cmd) {
         validateBackupForZone(cmd.getZoneId());
 
-        String providerName = cmd.getProvider();
+        String providerName = BackupProviderNameUtils.canonicalize(cmd.getProvider());
         if (StringUtils.isEmpty(providerName)) {
             throw new CloudRuntimeException("Provider name must be specified");
         }
@@ -695,7 +697,9 @@ public BackupSchedule configureBackupSchedule(CreateBackupScheduleCmd cmd) {
 
         final int maxBackups = validateAndGetDefaultBackupRetentionIfRequired(cmd.getMaxBackups(), offering, vm);
 
-        if ((!"nas".equals(offering.getProvider()) && !"commvault".equals(offering.getProvider())) && cmd.getQuiesceVM() != null) {
+        if (!BackupProviderNameUtils.isNasFamily(offering.getProvider()) &&
+                !BackupProviderNameUtils.isCommvaultFamily(offering.getProvider()) &&
+                cmd.getQuiesceVM() != null) {
             throw new InvalidParameterValueException("Quiesce VM option is supported only for NAS, Commvault backup provider");
         }
 
@@ -897,7 +901,9 @@ public boolean createBackup(CreateBackupCmd cmd, Object job) throws ResourceAllo
             throw new CloudRuntimeException("The assigned backup offering does not allow ad-hoc user backup");
         }
 
-        if ((!"nas".equals(offering.getProvider()) && !"commvault".equals(offering.getProvider())) && cmd.getQuiesceVM() != null) {
+        if (!BackupProviderNameUtils.isNasFamily(offering.getProvider()) &&
+                !BackupProviderNameUtils.isCommvaultFamily(offering.getProvider()) &&
+                cmd.getQuiesceVM() != null) {
             throw new InvalidParameterValueException("Quiesce VM option is supported only for NAS, Commvault backup provider");
         }
 
@@ -1497,7 +1503,8 @@ public boolean restoreBackupToVM(final Long backupId, final Long vmId) throws Cl
 
             String host = null;
             String dataStore = null;
-            if (!"nas".equals(offering.getProvider()) && !"commvault".equals(offering.getProvider())) {
+            if (!BackupProviderNameUtils.isNasFamily(offering.getProvider()) &&
+                    !BackupProviderNameUtils.isCommvaultFamily(offering.getProvider())) {
                 Pair<HostVO, StoragePoolVO> restoreInfo = getRestoreVolumeHostAndDatastore(vm);
                 host = restoreInfo.first().getPrivateIpAddress();
                 dataStore = restoreInfo.second().getUuid();
@@ -1575,7 +1582,8 @@ public boolean restoreBackupVolumeAndAttachToVM(final String backedUpVolumeUuid,
         BackupProvider backupProvider = getBackupProvider(offering.getProvider());
         VolumeVO backedUpVolume = volumeDao.findByUuid(backedUpVolumeUuid);
         Pair<HostVO, StoragePoolVO> restoreInfo;
-        if ((!"nas".equals(offering.getProvider()) && !"commvault".equals(offering.getProvider())) || backedUpVolume == null) {
+        if ((!BackupProviderNameUtils.isNasFamily(offering.getProvider()) &&
+                !BackupProviderNameUtils.isCommvaultFamily(offering.getProvider())) || backedUpVolume == null) {
             restoreInfo = getRestoreVolumeHostAndDatastore(vm);
         } else {
             restoreInfo = getRestoreVolumeHostAndDatastoreForNas(vm, backedUpVolume);
@@ -1777,7 +1785,18 @@ public void validateBackupForZone(final Long zoneId) {
 
     @Override
     public List<BackupProvider> listBackupProviders() {
-        return backupProviders;
+        final List<BackupProvider> providers = new ArrayList<>();
+        final Set<String> seenProviders = new HashSet<>();
+        for (final BackupProvider provider : backupProviders) {
+            if (provider == null) {
+                continue;
+            }
+            final String displayName = BackupProviderNameUtils.toDisplayName(provider.getName());
+            if (seenProviders.add(displayName)) {
+                providers.add(provider);
+            }
+        }
+        return providers;
     }
 
     @Override
@@ -1807,7 +1826,12 @@ public List<BackupProvider> getBackupProvidersForZone(final Long zoneId) {
             if (!StringUtils.isEmpty(trimmedName)) {
                 try {
                     BackupProvider provider = getBackupProvider(trimmedName);
-                    providers.add(provider);
+                    boolean exists = providers.stream().anyMatch(p ->
+                            BackupProviderNameUtils.toDisplayName(p.getName()).equalsIgnoreCase(
+                                    BackupProviderNameUtils.toDisplayName(provider.getName())));
+                    if (!exists) {
+                        providers.add(provider);
+                    }
                 } catch (CloudRuntimeException e) {
                     logger.warn("Failed to load backup provider: " + trimmedName + " for zone: " + zoneId, e);
                 }
@@ -1823,10 +1847,11 @@ public BackupProvider getBackupProvider(final String name) {
         if (StringUtils.isEmpty(name)) {
             throw new CloudRuntimeException("Invalid backup provider name provided");
         }
-       if (!backupProvidersMap.containsKey(name)) {
-           throw new CloudRuntimeException("Failed to find backup provider by the name: " + name);
+       final String canonicalName = BackupProviderNameUtils.canonicalize(name);
+       if (!backupProvidersMap.containsKey(canonicalName)) {
+           throw new CloudRuntimeException("Failed to find backup provider by the name: " + canonicalName);
        }
-       return backupProvidersMap.get(name);
+       return backupProvidersMap.get(canonicalName);
     }
 
     @Override
diff --git a/ui/src/utils/plugins.js b/ui/src/utils/plugins.js
index f8cc200af390..ee1d8dd062d9 100644
--- a/ui/src/utils/plugins.js
+++ b/ui/src/utils/plugins.js
@@ -678,7 +678,7 @@ export const backupUtilPlugin = {
       if (!provider && typeof provider !== 'string') {
         return false
       }
-      return ['nas', 'commvault'].includes(provider.toLowerCase())
+      return ['nas', 'commvault', 'ablestack-nas', 'ablestack-commvault'].includes(provider.toLowerCase())
     }
   }
 }
diff --git a/ui/src/views/compute/StartBackup.vue b/ui/src/views/compute/StartBackup.vue
index 3f281f480a54..496a10598719 100644
--- a/ui/src/views/compute/StartBackup.vue
+++ b/ui/src/views/compute/StartBackup.vue
@@ -88,7 +88,7 @@ export default {
   },
   computed: {
     canSetNameAndDescription () {
-      return ['nas', 'commvault', 'dummy'].includes(this.provider)
+      return ['nas', 'commvault', 'dummy', 'ablestack-nas', 'ablestack-commvault'].includes(this.provider)
     }
   },
   methods: {

From 29dd89d694a34b2d5cc2798ca3aaabfe2166749a Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 15:22:58 +0900
Subject: [PATCH 84/93] =?UTF-8?q?=EB=B0=B1=EC=97=85=20=EC=9C=A0=EC=A7=80?=
 =?UTF-8?q?=EA=B0=AF=EC=88=98=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EC=A6=9D?=
 =?UTF-8?q?=EB=B6=84=20=EB=B0=B1=EC=97=85=20=EC=B2=B4=EC=9D=B8=20=EA=B2=B0?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AblestackCommvaultBackupProvider.java       | 17 ++++++++++++++++-
 .../backup/AblestackNasBackupProvider.java      | 17 ++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
index a36bf26256d8..5eef8a303077 100644
--- a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
@@ -61,6 +61,7 @@
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDaoImpl;
+import org.apache.cloudstack.backup.dao.BackupScheduleDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.framework.config.ConfigKey;
@@ -216,6 +217,9 @@ public class AblestackCommvaultBackupProvider extends AdapterBase implements Bac
     @Inject
     private DiskOfferingDao diskOfferingDao;
 
+    @Inject
+    private BackupScheduleDao backupScheduleDao;
+
     private Long getClusterIdFromRootVolume(VirtualMachine vm) {
         VolumeVO rootVolume = volumeDao.getInstanceRootVolume(vm.getId());
         StoragePoolVO rootDiskPool = primaryDataStoreDao.findById(rootVolume.getPoolId());
@@ -350,7 +354,18 @@ private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBacku
             return false;
         }
 
-        return canContinueIncrementalChain(vm, latestBackup, vmHost) && getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+        return canContinueIncrementalChain(vm, latestBackup, vmHost) && getBackupChainSize(vm, latestBackup) < getEffectiveIncrementalLimit(vm);
+    }
+
+    private int getEffectiveIncrementalLimit(VirtualMachine vm) {
+        int effectiveLimit = BackupDeltaMax.value();
+        List<BackupScheduleVO> schedules = backupScheduleDao.listByVM(vm.getId());
+        for (BackupScheduleVO schedule : schedules) {
+            if (schedule != null && schedule.getMaxBackups() > 0) {
+                effectiveLimit = Math.min(effectiveLimit, schedule.getMaxBackups());
+            }
+        }
+        return effectiveLimit;
     }
 
     private boolean canContinueIncrementalChain(VirtualMachine vm, Backup latestBackup, Host vmHost) {
diff --git a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
index 88554847e5d1..8bd94bf157a2 100644
--- a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
+++ b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
@@ -51,6 +51,7 @@
 
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupRepositoryDao;
+import org.apache.cloudstack.backup.dao.BackupScheduleDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
 import org.apache.cloudstack.framework.config.ConfigKey;
@@ -156,6 +157,9 @@ public class AblestackNasBackupProvider extends AdapterBase implements BackupPro
     @Inject
     private DiskOfferingDao diskOfferingDao;
 
+    @Inject
+    private BackupScheduleDao backupScheduleDao;
+
     private Long getClusterIdFromRootVolume(VirtualMachine vm) {
         VolumeVO rootVolume = volumeDao.getInstanceRootVolume(vm.getId());
         StoragePoolVO rootDiskPool = primaryDataStoreDao.findById(rootVolume.getPoolId());
@@ -431,7 +435,18 @@ private boolean shouldUseIncrementalBackup(VirtualMachine vm, Backup latestBacku
             return false;
         }
 
-        return getBackupChainSize(vm, latestBackup) < BackupDeltaMax.value();
+        return getBackupChainSize(vm, latestBackup) < getEffectiveIncrementalLimit(vm);
+    }
+
+    private int getEffectiveIncrementalLimit(VirtualMachine vm) {
+        int effectiveLimit = BackupDeltaMax.value();
+        List<BackupScheduleVO> schedules = backupScheduleDao.listByVM(vm.getId());
+        for (BackupScheduleVO schedule : schedules) {
+            if (schedule != null && schedule.getMaxBackups() > 0) {
+                effectiveLimit = Math.min(effectiveLimit, schedule.getMaxBackups());
+            }
+        }
+        return effectiveLimit;
     }
 
     private int getBackupChainSize(VirtualMachine vm, Backup latestBackup) {

From 9022925b17abeb5703b027dcf8647ef9745b9b42 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 15:33:23 +0900
Subject: [PATCH 85/93] Update AblestackNasRestoreBackupCommand.java

---
 .../cloudstack/backup/AblestackNasRestoreBackupCommand.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java b/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java
index 85ddd3cd3118..ca2c07a0a01d 100644
--- a/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java
+++ b/core/src/main/java/org/apache/cloudstack/backup/AblestackNasRestoreBackupCommand.java
@@ -26,7 +26,7 @@
 
 import java.util.List;
 
-public class RestoreBackupCommand extends Command  {
+public class AblestackNasRestoreBackupCommand extends Command  {
     private String vmName;
     private String backupPath;
     private String backupRepoType;
@@ -43,7 +43,7 @@ public class RestoreBackupCommand extends Command  {
     private Integer mountTimeout;
     private String cacheMode;
 
-    protected RestoreBackupCommand() {
+    protected AblestackNasRestoreBackupCommand() {
         super();
     }
 

From 2ecf18bff2c70d5a92c7b1bff2677ce348ee4a80 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 15:40:14 +0900
Subject: [PATCH 86/93] =?UTF-8?q?=EC=A4=91=EA=B0=84=EC=B2=B4=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B3=B5=EC=9B=90=EC=8B=9C=20=ED=8F=B4=EB=8D=94=EB=B3=84?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=B4=EB=82=B4=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AblestackCommvaultBackupProvider.java     | 42 ++++++++++++++++---
 .../commvault/AblestackCommvaultClient.java   |  7 ++++
 .../cloudstack/backup/BackupManagerImpl.java  |  1 -
 3 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
index 5eef8a303077..d1874536c38d 100644
--- a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
@@ -782,6 +782,35 @@ private LinkedHashMap<String, Backup> getBackupChainStageHosts(Backup backup) {
         return stageHosts;
     }
 
+    private List<String> getRestoreSourcePathsForStageHost(Backup backup, String stageHost) {
+        if (!BACKUP_ENGINE_RBD_DIFF.equals(getBackupDetail(backup, DETAIL_BACKUP_ENGINE))) {
+            return Collections.singletonList(getRestoreBackupRootPath(backup));
+        }
+
+        List<String> restoreSourcePaths = new ArrayList<>();
+        Backup current = backup;
+        while (current != null) {
+            loadBackupDetailsIfNeeded(current);
+            String currentStageHost = getBackupDetail(current, DETAIL_STAGE_HOST);
+            if (Objects.equals(currentStageHost, stageHost)) {
+                String backupPath = parseExternalId(current.getExternalId()).first();
+                if (!restoreSourcePaths.contains(backupPath)) {
+                    restoreSourcePaths.add(0, backupPath);
+                }
+            }
+            String parentBackupUuid = getBackupDetail(current, DETAIL_PARENT_BACKUP_UUID);
+            if (parentBackupUuid == null) {
+                break;
+            }
+            current = backupDao.findByUuid(parentBackupUuid);
+        }
+
+        if (restoreSourcePaths.isEmpty()) {
+            restoreSourcePaths.add(getRestoreBackupRootPath(backup));
+        }
+        return restoreSourcePaths;
+    }
+
     private void loadBackupDetailsIfNeeded(Backup backup) {
         if (backup instanceof BackupVO && backup.getDetails() == null) {
             backupDao.loadDetails((BackupVO) backup);
@@ -820,15 +849,14 @@ private List<String> restoreBackupSourcesOnAdditionalHosts(AblestackCommvaultCli
             if (StringUtils.isBlank(stageHost) || Objects.equals(stageHost, executionHostName)) {
                 continue;
             }
-            restoreBackupRootOnStageHost(client, entry.getValue());
+            restoreBackupPathsOnStageHost(client, entry.getValue(), getRestoreSourcePathsForStageHost(backup, stageHost));
             additionalHosts.add(stageHost);
         }
         return additionalHosts;
     }
 
-    private void restoreBackupRootOnStageHost(AblestackCommvaultClient client, Backup backup) {
+    private void restoreBackupPathsOnStageHost(AblestackCommvaultClient client, Backup backup, List<String> restoreSourcePaths) {
         final Pair<String, String> externalIdParts = parseExternalId(backup.getExternalId());
-        final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
         if (jobDetails == null) {
@@ -856,7 +884,7 @@ private void restoreBackupRootOnStageHost(AblestackCommvaultClient client, Backu
         }
 
         String restoreJobId = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName,
-                appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
+                appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePaths);
         if (restoreJobId == null) {
             throw new CloudRuntimeException("Failed to restore Full VM commvault api");
         }
@@ -918,6 +946,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         final String externalId = backup.getExternalId();
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
+        final List<String> restoreSourcePaths = getRestoreSourcePathsForStageHost(backup, clientName);
         final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
@@ -949,7 +978,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         final List<String> additionalSourceHosts = restoreBackupSourcesOnAdditionalHosts(client, backup, clientName);
         LOG.info(String.format("Restoring vm %s from backup %s on the Commvault Backup Provider", vm, backup));
         try {
-            String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
+            String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePaths);
             if (jobId2 != null) {
                 String jobStatus = client.getJobStatus(jobId2);
                 if (jobStatus.equalsIgnoreCase("Completed")) {
@@ -1060,6 +1089,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         final AblestackCommvaultClient client = getClient(zoneId);
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
+        final List<String> restoreSourcePaths = getRestoreSourcePathsForStageHost(backup, clientName);
         final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
@@ -1087,7 +1117,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         }
         final List<String> additionalSourceHosts = restoreBackupSourcesOnAdditionalHosts(client, backup, clientName);
         try {
-            String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePath);
+            String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePaths);
             if (jobId2 != null) {
                 String jobStatus = client.getJobStatus(jobId2);
                 if (jobStatus.equalsIgnoreCase("Completed")) {
diff --git a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
index 860a4d248b97..2c39c70d1893 100644
--- a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
@@ -1430,6 +1430,13 @@ public String restoreFullVM(String subclientId, String displayName, String backu
         return null;
     }
 
+    public String restoreFullVM(String subclientId, String displayName, String backupsetGUID, String clientId, String companyId, String companyName, String instanceName,
+                                String appName, String applicationId, String clientName, String backupsetId, String instanceId, String backupsetName,
+                                String commCellId, String endTime, List<String> paths) {
+        return restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName,
+                applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, String.join(",", paths));
+    }
+
     // GET https://<commserveIp>/commandcenter/api/commcell/properties
     // 에이전트 설치를 위한 commcell 정보 조회 API
     public String getCommcell() {
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 68d801c3c4f7..29f3c8fcd0ba 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -67,7 +67,6 @@
 import org.apache.cloudstack.api.command.user.backup.repository.UpdateBackupRepositoryCmd;
 import org.apache.cloudstack.api.command.user.vm.CreateVMFromBackupCmd;
 import org.apache.cloudstack.api.response.BackupResponse;
-import org.apache.cloudstack.backup.BackupProviderNameUtils;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.backup.dao.BackupDetailsDao;
 import org.apache.cloudstack.backup.dao.BackupOfferingDao;

From 25e05c32c76b684b4a7a6e2c9f2a452a254ee1a5 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 15:46:23 +0900
Subject: [PATCH 87/93] Update LibvirtAblestackNasBackupHelper.java

---
 .../kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
index 5c837e6bc75a..b4239714217c 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
@@ -448,11 +448,11 @@ private void runCommand(String command) {
         Script.runSimpleBashScriptForExitValue(command, resource.getCmdsTimeout(), false);
     }
 
-    private boolean isIncremental(TakeBackupCommand command) {
+    private boolean isIncremental(AblestackNasTakeBackupCommand command) {
         return "INCREMENTAL".equalsIgnoreCase(command.getBackupType());
     }
 
-    private String getBackupFileByIndex(TakeBackupCommand command, int index, String fallback) {
+    private String getBackupFileByIndex(AblestackNasTakeBackupCommand command, int index, String fallback) {
         List<String> backupFiles = command.getBackupFiles();
         if (CollectionUtils.isNullOrEmpty(backupFiles) || index >= backupFiles.size()) {
             return fallback;

From 2ae6e71e22354a90190614f0f7949e529923498a Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 16:07:19 +0900
Subject: [PATCH 88/93] =?UTF-8?q?=EB=B9=8C=EB=93=9C=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LibvirtAblestackCommvaultTakeBackupCommandWrapper.java      | 2 +-
 .../kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java
index dae16d70d746..1509cae11cc9 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackCommvaultTakeBackupCommandWrapper.java
@@ -37,7 +37,7 @@ public Answer execute(AblestackCommvaultTakeBackupCommand command, LibvirtComput
         if (result.first() != 0) {
             logger.debug("Failed to take VM backup");
             BackupAnswer answer = new BackupAnswer(command, false, null);
-            if (result.first() == LibvirtCommvaultBackupHelper.EXIT_CLEANUP_FAILED) {
+            if (result.first() == LibvirtAblestackCommvaultBackupHelper.EXIT_CLEANUP_FAILED) {
                 logger.debug("Backup cleanup failed");
                 answer.setNeedsCleanup(true);
             }
diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
index b4239714217c..391eb067717f 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtAblestackNasBackupHelper.java
@@ -133,7 +133,7 @@ long parseBackupSize(String output, List<String> diskPaths) {
 
     private String[] buildBackupScriptCommand(AblestackNasTakeBackupCommand command, List<String> diskPaths, BackupExecutionMode executionMode) {
         return new String[] {
-                resource.getAblestackNasBackupPath(),
+                resource.getAbleNasBackupPath(),
                 "-o", executionMode.getScriptOperation(),
                 "-v", command.getVmName(),
                 "-t", command.getBackupRepoType(),

From 5c7ab1a092fb47b7a1b261b310005eeeb77799eb Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 16:19:16 +0900
Subject: [PATCH 89/93] =?UTF-8?q?=EB=B9=8C=EB=93=9C=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cloudstack/backup/AblestackCommvaultBackupProvider.java | 6 +++---
 .../backup/commvault/AblestackCommvaultClient.java          | 2 +-
 .../cloudstack/backup/AblestackNasBackupOffering.java       | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
index d1874536c38d..075dc8ce98ca 100644
--- a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/AblestackCommvaultBackupProvider.java
@@ -946,7 +946,6 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         final String externalId = backup.getExternalId();
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
-        final List<String> restoreSourcePaths = getRestoreSourcePathsForStageHost(backup, clientName);
         final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
@@ -976,6 +975,7 @@ private Pair<Boolean, String> restoreVMBackup(VirtualMachine vm, Backup backup)
         final HostVO restoreHost = hostDao.findByName(clientName);
         final HostVO restoreHostVO = hostDao.findById(restoreHost.getId());
         final List<String> additionalSourceHosts = restoreBackupSourcesOnAdditionalHosts(client, backup, clientName);
+        final List<String> restoreSourcePaths = getRestoreSourcePathsForStageHost(backup, clientName);
         LOG.info(String.format("Restoring vm %s from backup %s on the Commvault Backup Provider", vm, backup));
         try {
             String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePaths);
@@ -1089,7 +1089,6 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         final AblestackCommvaultClient client = getClient(zoneId);
         final Pair<String, String> externalIdParts = parseExternalId(externalId);
         final String path = externalIdParts.first();
-        final List<String> restoreSourcePaths = getRestoreSourcePathsForStageHost(backup, clientName);
         final String restoreSourcePath = getRestoreBackupRootPath(backup);
         final String jobId = externalIdParts.second();
         String jobDetails = client.getJobDetails(jobId);
@@ -1115,6 +1114,7 @@ public Pair<Boolean, String> restoreBackedUpVolume(Backup backup, Backup.VolumeI
         if (backupsetGUID == null) {
             throw new CloudRuntimeException("Failed to get vm backup set guid commvault api");
         }
+        final List<String> restoreSourcePaths = getRestoreSourcePathsForStageHost(backup, clientName);
         final List<String> additionalSourceHosts = restoreBackupSourcesOnAdditionalHosts(client, backup, clientName);
         try {
             String jobId2 = client.restoreFullVM(subclientId, displayName, backupsetGUID, clientId, companyId, companyName, instanceName, appName, applicationId, clientName, backupsetId, instanceId, backupsetName, commCellId, endTime, restoreSourcePaths);
@@ -1276,7 +1276,7 @@ public boolean assignVMToBackupOffering(VirtualMachine vm, BackupOffering backup
 
     @Override
     public boolean removeVMFromBackupOffering(VirtualMachine vm) {
-        final CommvaultClient client = getClient(vm.getDataCenterId());
+        final AblestackCommvaultClient client = getClient(vm.getDataCenterId());
         List<HostVO> Hosts = hostDao.findByDataCenterId(vm.getDataCenterId());
         boolean allDeleted = true;
         for (final HostVO host : Hosts) {
diff --git a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
index 2c39c70d1893..66c75b17ca4c 100644
--- a/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
+++ b/plugins/backup/ablestack-commvault/src/main/java/org/apache/cloudstack/backup/commvault/AblestackCommvaultClient.java
@@ -251,7 +251,7 @@ public List<BackupOffering> listPlans() {
                     if (!planDetails.isMissingNode()) {
                         String planId = planDetails.path("planId").asText();
                         String planName = planDetails.path("planName").asText();
-                        offerings.add(new CommvaultBackupOffering(planName, planId));
+                        offerings.add(new AblestackCommvaultBackupOffering(planName, planId));
                     }
                 }
             }
diff --git a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java
index 8196deeb4a52..b7b6beab6ce9 100644
--- a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java
+++ b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupOffering.java
@@ -23,7 +23,7 @@ public class AblestackNasBackupOffering implements BackupOffering {
     private String name;
     private String uid;
 
-    public NasBackupOffering(String name, String uid) {
+    public AblestackNasBackupOffering(String name, String uid) {
         this.name = name;
         this.uid = uid;
     }

From 0f8629125e3ebe31fb05afcad91f0778b6239bfb Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 16:26:50 +0900
Subject: [PATCH 90/93] Update AblestackNasBackupProvider.java

---
 .../apache/cloudstack/backup/AblestackNasBackupProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
index 8bd94bf157a2..e6efc16d3435 100644
--- a/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
+++ b/plugins/backup/ablestack-nas/src/main/java/org/apache/cloudstack/backup/AblestackNasBackupProvider.java
@@ -991,7 +991,7 @@ public List<BackupOffering> listBackupOfferings(Long zoneId) {
         final List<BackupRepository> repositories = backupRepositoryDao.listByZoneAndProvider(zoneId, getName());
         final List<BackupOffering> offerings = new ArrayList<>();
         for (final BackupRepository repository : repositories) {
-            offerings.add(new NasBackupOffering(repository.getName(), repository.getUuid()));
+            offerings.add(new AblestackNasBackupOffering(repository.getName(), repository.getUuid()));
         }
         return offerings;
     }

From 3d2849c835e7f0680cfce3a6de246eba2a842cfc Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 16:34:50 +0900
Subject: [PATCH 91/93] =?UTF-8?q?=EB=B9=8C=EB=93=9C=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backup/AblestackNasBackupProviderTest.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java b/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java
index 229a6f8e7f05..2d6575209897 100644
--- a/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java
+++ b/plugins/backup/ablestack-nas/src/test/java/org/apache/cloudstack/backup/AblestackNasBackupProviderTest.java
@@ -115,7 +115,7 @@ public void testDeleteBackup() throws OperationTimedoutException, AgentUnavailab
         Mockito.when(hostDao.findById(hostId)).thenReturn(host);
         Mockito.when(backupRepositoryDao.findByBackupOfferingId(1L)).thenReturn(backupRepository);
         Mockito.when(vmInstanceDao.findByIdIncludingRemoved(1L)).thenReturn(vm);
-        Mockito.when(agentManager.send(anyLong(), Mockito.any(AblestackDeleteBackupCommand.class))).thenReturn(new BackupAnswer(new DeleteBackupCommand(null, null, null, null, true), true, "details"));
+        Mockito.when(agentManager.send(anyLong(), Mockito.any(AblestackDeleteBackupCommand.class))).thenReturn(new BackupAnswer(new AblestackDeleteBackupCommand(null, null, null, null, true), true, "details"));
         Mockito.when(backupDao.remove(1L)).thenReturn(true);
 
         boolean result = ablestackNasBackupProvider.deleteBackup(backup, true);
@@ -138,7 +138,7 @@ public void testSyncBackupStorageStats() throws AgentUnavailableException, Opera
         answer.setUsedSize(50L);
         Mockito.when(agentManager.send(anyLong(), Mockito.any(GetBackupStorageStatsCommand.class))).thenReturn(answer);
 
-        nasBackupProvider.syncBackupStorageStats(1L);
+        ablestackNasBackupProvider.syncBackupStorageStats(1L);
         Mockito.verify(backupRepositoryDao, Mockito.times(1)).updateCapacity(backupRepository, 100L, 50L);
     }
 
@@ -150,7 +150,7 @@ public void testListBackupOfferings() {
 
         Mockito.when(backupRepositoryDao.listByZoneAndProvider(1L, "nas")).thenReturn(Collections.singletonList(backupRepository));
 
-        List<BackupOffering> result = nasBackupProvider.listBackupOfferings(1L);
+        List<BackupOffering> result = ablestackNasBackupProvider.listBackupOfferings(1L);
         Assert.assertEquals(1, result.size());
         Assert.assertEquals("test-repo", result.get(0).getName());
         Assert.assertEquals("uuid", result.get(0).getUuid());
@@ -169,7 +169,7 @@ public void testGetBackupStorageStats() {
         Mockito.when(backupRepositoryDao.listByZoneAndProvider(1L, "nas"))
                 .thenReturn(List.of(backupRepository1, backupRepository2));
 
-        Pair<Long, Long> result = nasBackupProvider.getBackupStorageStats(1L);
+        Pair<Long, Long> result = ablestackNasBackupProvider.getBackupStorageStats(1L);
         Assert.assertEquals(Long.valueOf(1100L), result.first());
         Assert.assertEquals(Long.valueOf(3000L), result.second());
     }
@@ -222,7 +222,7 @@ public void takeBackupSuccessfully() throws AgentUnavailableException, Operation
         Mockito.when(backupDao.persist(Mockito.any(BackupVO.class))).thenAnswer(invocation -> invocation.getArgument(0));
         Mockito.when(backupDao.update(Mockito.anyLong(), Mockito.any(BackupVO.class))).thenReturn(true);
 
-        Pair<Boolean, Backup> result = nasBackupProvider.takeBackup(vm, false);
+        Pair<Boolean, Backup> result = ablestackNasBackupProvider.takeBackup(vm, false);
 
         Assert.assertTrue(result.first());
         Assert.assertNotNull(result.second());
@@ -255,7 +255,7 @@ public void testGetVMHypervisorHost() {
         Mockito.when(host.getStatus()).thenReturn(Status.Up);
         Mockito.when(hostDao.findById(hostId)).thenReturn(host);
 
-        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+        Host result = ablestackNasBackupProvider.getVMHypervisorHost(vm);
 
         Assert.assertNotNull(result);
         Assert.assertTrue(Objects.equals(hostId, result.getId()));
@@ -282,7 +282,7 @@ public void testGetVMHypervisorHostWithHostDown() {
         Mockito.when(upHostInCluster.getStatus()).thenReturn(Status.Up);
         Mockito.when(hostDao.findHypervisorHostInCluster(clusterId)).thenReturn(List.of(upHostInCluster));
 
-        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+        Host result = ablestackNasBackupProvider.getVMHypervisorHost(vm);
 
         Assert.assertNotNull(result);
         Assert.assertTrue(Objects.equals(Long.valueOf(3L), result.getId()));
@@ -314,7 +314,7 @@ public void testGetVMHypervisorHostWithUpHostViaRootVolumeCluster() {
         Mockito.when(upHostInCluster.getStatus()).thenReturn(Status.Up);
         Mockito.when(hostDao.findHypervisorHostInCluster(clusterId)).thenReturn(List.of(upHostInCluster));
 
-        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+        Host result = ablestackNasBackupProvider.getVMHypervisorHost(vm);
 
         Assert.assertNotNull(result);
         Assert.assertTrue(Objects.equals(Long.valueOf(4L), result.getId()));
@@ -346,7 +346,7 @@ public void testGetVMHypervisorHostFallbackToZoneWideKVMHost() {
         Mockito.when(resourceManager.findOneRandomRunningHostByHypervisor(Hypervisor.HypervisorType.KVM, zoneId))
                 .thenReturn(fallbackHost);
 
-        Host result = nasBackupProvider.getVMHypervisorHost(vm);
+        Host result = ablestackNasBackupProvider.getVMHypervisorHost(vm);
 
         Assert.assertNotNull(result);
         Assert.assertTrue(Objects.equals(Long.valueOf(5L), result.getId()));

From ae0103bb914838b45c3257262f7c910df6fb5f15 Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 17:03:09 +0900
Subject: [PATCH 92/93] =?UTF-8?q?=EC=9E=AC=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{commvault => ablestack-commvault}/module.properties        | 2 +-
 .../spring-backup-commvault-context.xml                         | 0
 .../cloudstack/{nas => ablestack-nas}/module.properties         | 2 +-
 .../{nas => ablestack-nas}/spring-backup-nas-context.xml        | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/{commvault => ablestack-commvault}/module.properties (92%)
 rename plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/{commvault => ablestack-commvault}/spring-backup-commvault-context.xml (100%)
 rename plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/{nas => ablestack-nas}/module.properties (92%)
 rename plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/{nas => ablestack-nas}/spring-backup-nas-context.xml (100%)

diff --git a/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/ablestack-commvault/module.properties
similarity index 92%
rename from plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
rename to plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/ablestack-commvault/module.properties
index f0fddd257164..de14814cfa68 100644
--- a/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/module.properties
+++ b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/ablestack-commvault/module.properties
@@ -1,7 +1,7 @@
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
+# regarding copyright ownership. The ASF licenses this file
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
diff --git a/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml b/plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/ablestack-commvault/spring-backup-commvault-context.xml
similarity index 100%
rename from plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/commvault/spring-backup-commvault-context.xml
rename to plugins/backup/ablestack-commvault/src/main/resources/META-INF/cloudstack/ablestack-commvault/spring-backup-commvault-context.xml
diff --git a/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/ablestack-nas/module.properties
similarity index 92%
rename from plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties
rename to plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/ablestack-nas/module.properties
index 9079d19e8522..5a64e71d2dfa 100644
--- a/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/module.properties
+++ b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/ablestack-nas/module.properties
@@ -1,7 +1,7 @@
 # Licensed to the Apache Software Foundation (ASF) under one
 # or more contributor license agreements.  See the NOTICE file
 # distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
+# regarding copyright ownership. The ASF licenses this file
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
diff --git a/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml b/plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/ablestack-nas/spring-backup-nas-context.xml
similarity index 100%
rename from plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/nas/spring-backup-nas-context.xml
rename to plugins/backup/ablestack-nas/src/main/resources/META-INF/cloudstack/ablestack-nas/spring-backup-nas-context.xml

From ea1f66cc45ba564116cec92ffac41b4db487fade Mon Sep 17 00:00:00 2001
From: Dajeong-Park <ekwjd7182@gmail.com>
Date: Fri, 10 Apr 2026 17:54:25 +0900
Subject: [PATCH 93/93] =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/pom.xml                                         |  7 ++++++-
 .../apache/cloudstack/backup/BackupManagerImpl.java    | 10 +++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/client/pom.xml b/client/pom.xml
index d54cb4493d17..f7600cde2ce6 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -614,7 +614,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-backup-commvault</artifactId>
+            <artifactId>cloud-plugin-backup-ablestasck-nas</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.cloudstack</groupId>
+            <artifactId>cloud-plugin-backup-ablestack-commvault</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
index 29f3c8fcd0ba..3566207a2316 100644
--- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
+++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java
@@ -1846,11 +1846,11 @@ public BackupProvider getBackupProvider(final String name) {
         if (StringUtils.isEmpty(name)) {
             throw new CloudRuntimeException("Invalid backup provider name provided");
         }
-       final String canonicalName = BackupProviderNameUtils.canonicalize(name);
-       if (!backupProvidersMap.containsKey(canonicalName)) {
-           throw new CloudRuntimeException("Failed to find backup provider by the name: " + canonicalName);
-       }
-       return backupProvidersMap.get(canonicalName);
+        final String canonicalName = BackupProviderNameUtils.canonicalize(name);
+        if (!backupProvidersMap.containsKey(canonicalName)) {
+            throw new CloudRuntimeException("Failed to find backup provider by the name: " + canonicalName);
+        }
+        return backupProvidersMap.get(canonicalName);
     }
 
     @Override