Merge pull request #920 from MissionCriticalCloud/fix_snapshots

Added flag to revert snapshot
MissionCriticalCloud · Jan 29, 2021 · c3f5e3f · c3f5e3f
2 parents 45501ea + 53071b0
commit c3f5e3f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/...ain/java/com/cloud/agent/resource/kvm/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java b/...ain/java/com/cloud/agent/resource/kvm/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java
@@ -38,7 +38,7 @@ public Answer execute(final RestoreVMSnapshotCommand cmd, final LibvirtComputing
             if (dm == null) {
                 return new RestoreVMSnapshotAnswer(cmd, false, "Restore VM Snapshot Failed due to can not find vm: " + vmName);
             }
-            final String xmlDesc = dm.getXMLDesc(0);
+            final String xmlDesc = dm.getXMLDesc(8);
 
             final List<VMSnapshotTO> snapshots = cmd.getSnapshots();
             final Map<Long, VMSnapshotTO> snapshotAndParents = cmd.getSnapshotAndParents();

diff --git a/...in/java/com/cloud/agent/resource/kvm/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java b/...in/java/com/cloud/agent/resource/kvm/wrapper/LibvirtRevertToVMSnapshotCommandWrapper.java
@@ -1,5 +1,7 @@
 package com.cloud.agent.resource.kvm.wrapper;
 
+import static org.libvirt.flags.DomainSnapshotRevertFlags.*;
+
 import com.cloud.agent.resource.kvm.LibvirtComputingResource;
 import com.cloud.common.request.ResourceWrapper;
 import com.cloud.legacymodel.communication.answer.Answer;
@@ -15,6 +17,7 @@
 import org.libvirt.Domain;
 import org.libvirt.DomainSnapshot;
 import org.libvirt.LibvirtException;
+import org.libvirt.flags.DomainSnapshotListFlags;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -46,7 +49,7 @@ public Answer execute(final RevertToVMSnapshotCommand cmd, final LibvirtComputin
                 return new RevertToVMSnapshotAnswer(cmd, false, "Cannot find vmSnapshot with name: " + cmd.getTarget().getSnapshotName());
             }
 
-            dm.revertToSnapshot(snapshot);
+            dm.revertToSnapshot(snapshot, VIR_DOMAIN_SNAPSHOT_REVERT_FORCE | VIR_DOMAIN_SNAPSHOT_REVERT_RUNNING);
             snapshot.free();
 
             if (!snapshotMemory) {

diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,7 @@
         <cs.jna.version>4.4.0</cs.jna.version>
         <cs.jsch.version>0.1.54</cs.jsch.version>
         <cs.jstl.version>1.2</cs.jstl.version>
-        <cs.libvirt.version>1.0.5</cs.libvirt.version>
+        <cs.libvirt.version>1.0.6</cs.libvirt.version>
         <cs.mail.version>1.4.7</cs.mail.version>
         <cs.mockito-all.version>1.10.19</cs.mockito-all.version>
         <cs.mycila.license.version>2.7</cs.mycila.license.version>