You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/04/16 13:15:34 UTC

[cloudstack] branch master updated: Bring back vm.suspend during deleting VM snapshot (#4029)

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new b406e1d  Bring back vm.suspend during deleting VM snapshot (#4029)
b406e1d is described below

commit b406e1dc4696d2b529add947fa5f81f358cf1cc5
Author: Andrija Panic <45...@users.noreply.github.com>
AuthorDate: Thu Apr 16 15:15:22 2020 +0200

    Bring back vm.suspend during deleting VM snapshot (#4029)
---
 .../java/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java | 7 +++++++
 1 file changed, 7 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 9e1ff71..617dfc9 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
@@ -1005,6 +1005,13 @@ public class KVMStorageProcessor implements StorageProcessor {
                             primaryStore.getUuid());
                     if (state == DomainInfo.DomainState.VIR_DOMAIN_RUNNING && !primaryStorage.isExternalSnapshot()) {
                         final DomainSnapshot snap = vm.snapshotLookupByName(snapshotName);
+                        try {
+                            s_logger.info(String.format("Suspending VM '%s' to delete snapshot,", vm.getName()));
+                            vm.suspend();
+                        } catch (final LibvirtException e) {
+                            s_logger.error("Failed to suspend the VM", e);
+                            throw e;
+                        }
                         snap.delete(0);
 
                         /*