From 18e05894c718764aaa2339966ee409fe6fba2a0b Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Thu, 1 Aug 2024 18:15:11 +0530 Subject: [PATCH] add todos Signed-off-by: Rohit Yadav --- .../java/org/apache/cloudstack/backup/NASBackupProvider.java | 4 +++- scripts/vm/hypervisor/kvm/nasbackup.sh | 1 + 2 files changed, 4 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 c93ef15f323..24c0c7cc670 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 @@ -141,6 +141,8 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co @Override public boolean takeBackup(final VirtualMachine vm) { + // TODO: currently works for only running VMs + // TODO: add support for backup of stopped VMs final Host host = getRunningVMHypervisorHost(vm); final String backupStoragePath = getBackupStoragePath(vm.getDataCenterId()); @@ -187,7 +189,7 @@ public class NASBackupProvider extends AdapterBase implements BackupProvider, Co LOG.debug("Restoring vm " + vm.getUuid() + "from backup " + backup.getUuid() + " on the NAS Backup Provider"); // Find where the VM was last running - final Host hostVO = getLastVMHypervisorHost(vm); + final Host host = getLastVMHypervisorHost(vm); // TODO: get KVM agent to restore VM backup diff --git a/scripts/vm/hypervisor/kvm/nasbackup.sh b/scripts/vm/hypervisor/kvm/nasbackup.sh index 2cfae0d4e56..1595e7fb036 100755 --- a/scripts/vm/hypervisor/kvm/nasbackup.sh +++ b/scripts/vm/hypervisor/kvm/nasbackup.sh @@ -42,6 +42,7 @@ backup_vm() { virsh -c qemu:///system backup-begin --domain $vm --backupxml $dest/backup.xml > /dev/null 2>/dev/null virsh -c qemu:///system dumpxml $vm > $dest/domain-$vm.xml 2>/dev/null + rm -f $dest/backup.xml until virsh -c qemu:///system domjobinfo $vm --completed 2>/dev/null | grep "Completed" > /dev/null; do sleep 5