From 1bef11a9e56c664afb8e74254973cdfcb1350b1f Mon Sep 17 00:00:00 2001 From: "v.melnik" Date: Fri, 22 Feb 2019 18:11:01 +0200 Subject: [PATCH 1/2] Suspending a VM before to delete its volume's snapshot from a primary storage (see PR #3193) --- .../cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index 36be2d39a2e1..53a2278c1631 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -996,6 +996,12 @@ public Answer backupSnapshot(final CopyCommand cmd) { primaryStore.getUuid()); if (state == DomainInfo.DomainState.VIR_DOMAIN_RUNNING && !primaryStorage.isExternalSnapshot()) { final DomainSnapshot snap = vm.snapshotLookupByName(snapshotName); + try { + vm.suspend(); + } catch(final Exception e) { + s_logger.debug("Failed to suspend the VM: " + e); + throw e; + } snap.delete(0); /* From 300a7bf9df396f291bd67c182e7d635c7006be46 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Tue, 4 Jun 2019 16:02:05 +0530 Subject: [PATCH 2/2] Update en.js --- ui/l10n/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/l10n/en.js b/ui/l10n/en.js index 86a860616e0b..b9f36822b7ae 100644 --- a/ui/l10n/en.js +++ b/ui/l10n/en.js @@ -1922,7 +1922,7 @@ var dictionary = {"ICMP.code":"ICMP Code", "message.action.take.snapshot":"Please confirm that you want to take a snapshot of this volume.", "message.action.unmanage.cluster":"Please confirm that you want to unmanage the cluster.", "message.action.vmsnapshot.create":"Please confirm that you want to take a snapshot of this instance.
Please notice that the instance will be paused during the snapshoting, and resumed after snapshotting, if it runs on KVM.", -"message.action.vmsnapshot.delete":"Please confirm that you want to delete this VM snapshot.", +"message.action.vmsnapshot.delete":"Please confirm that you want to delete this VM snapshot.
Please notice that the instance will be paused before the snapshot deletion, and resumed after deletion, if it runs on KVM.", "message.action.vmsnapshot.revert":"Revert VM snapshot", "message.activate.project":"Are you sure you want to activate this project?", "message.add.VPN.gateway":"Please confirm that you want to add a VPN Gateway",