Skip to content

NAS backup provider: Support restore from backup to volumes on Ceph storage pool(s), and take backup for stopped instances with volumes on Ceph storage pool(s) #11684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 6 commits into from
Oct 6, 2025
Merged

NAS backup provider: Support restore from backup to volumes on Ceph storage pool(s), and take backup for stopped instances with volumes on Ceph storage pool(s) #11684

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5397375
Support restore from NAS backup to Ceph storage pool(s)
sureshanaparti Sep 19, 2025
792b80f
Fix restore/attach backup volume as RBD volume in Ceph storage pool
sureshanaparti Sep 19, 2025
1cc9e27
addressed review comments
sureshanaparti Sep 23, 2025
b85267b
Support take NAS backup for stopped instances with volumes on Ceph st…
sureshanaparti Sep 26, 2025
9edae46
test fixes
sureshanaparti Sep 26, 2025
ebd081a
Fix NPE for live vm backup
abh1sar Sep 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix NPE for live vm backup
  • Loading branch information
@abh1sar
abh1sar committed Sep 29, 2025
commit ebd081aa4b6fbd1e8df6a7a2d4651ed707781ecb
22 changes: 12 additions & 10 deletions .../main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,17 @@ public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvir
KVMStoragePoolManager storagePoolMgr = libvirtComputingResource.getStoragePoolMgr();

List<String> diskPaths = new ArrayList<>();
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);
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);
}
}
}

Expand All @@ -76,7 +78,7 @@ public Answer execute(TakeBackupCommand command, LibvirtComputingResource libvir
"-m", Objects.nonNull(mountOptions) ? mountOptions : "",
"-p", backupPath,
"-q", command.getQuiesce() != null && command.getQuiesce() ? "true" : "false",
"-d", (Objects.nonNull(diskPaths) && !diskPaths.isEmpty()) ? String.join(",", diskPaths) : ""
"-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
});

Pair<Integer, String> result = Script.executePipedCommands(commands, libvirtComputingResource.getCmdsTimeout());
Expand Down
Loading