Github user wido commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/977#discussion_r42975005
--- Diff:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreVMSnapshotCommandWrapper.java
---
@@ -0,0 +1,121 @@
+//
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+//
+
+package com.cloud.hypervisor.kvm.resource.wrapper;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.cloudstack.storage.to.VolumeObjectTO;
+import org.apache.log4j.Logger;
+import org.libvirt.Connect;
+import org.libvirt.Domain;
+import org.libvirt.LibvirtException;
+
+import com.cloud.agent.api.Answer;
+import com.cloud.agent.api.RestoreVMSnapshotAnswer;
+import com.cloud.agent.api.RestoreVMSnapshotCommand;
+import com.cloud.agent.api.VMSnapshotTO;
+import com.cloud.hypervisor.kvm.resource.LibvirtComputingResource;
+import com.cloud.resource.CommandWrapper;
+import com.cloud.resource.ResourceWrapper;
+import com.cloud.utils.script.Script;
+import com.cloud.vm.VirtualMachine;
+
+@ResourceWrapper(handles = RestoreVMSnapshotCommand.class)
+public final class LibvirtRestoreVMSnapshotCommandWrapper extends
CommandWrapper<RestoreVMSnapshotCommand, Answer, LibvirtComputingResource> {
+
+ private static final Logger s_logger =
Logger.getLogger(LibvirtRestoreVMSnapshotCommandWrapper.class);
+
+ @Override
+ public Answer execute(final RestoreVMSnapshotCommand cmd, final
LibvirtComputingResource libvirtComputingResource) {
+ String vmName = cmd.getVmName();
+ List<VolumeObjectTO> listVolumeTo = cmd.getVolumeTOs();
+ VirtualMachine.PowerState vmState =
VirtualMachine.PowerState.PowerOn;
+
+ Domain dm = null;
+ try {
+ final LibvirtUtilitiesHelper libvirtUtilitiesHelper =
libvirtComputingResource.getLibvirtUtilitiesHelper();
+ Connect conn = libvirtUtilitiesHelper.getConnection();
+ dm = libvirtComputingResource.getDomain(conn, vmName);
+
+ if (dm == null) {
+ return new RestoreVMSnapshotAnswer(cmd, false,
+ "Restore VM Snapshot Failed due to can not find
vm: " + vmName);
+ }
+ String xmlDesc = dm.getXMLDesc(0);
+
+ List<VMSnapshotTO> snapshots = cmd.getSnapshots();
+ Map<Long, VMSnapshotTO> snapshotAndParents =
cmd.getSnapshotAndParents();
+ for (VMSnapshotTO snapshot: snapshots) {
+ VMSnapshotTO parent =
snapshotAndParents.get(snapshot.getId());
+ String parentName = (parent == null)? "": ("
<parent><name>" + parent.getSnapshotName() + "</name></parent>\n");
+ String vmSnapshotXML = "<domainsnapshot>\n"
+ + " <name>" + snapshot.getSnapshotName() +
"</name>\n"
+ + " <state>running</state>\n"
+ + parentName
+ + " <creationTime>" + (int)
Math.rint(snapshot.getCreateTime()/1000) + "</creationTime>\n"
+ + xmlDesc
+ + "</domainsnapshot>";
+ s_logger.debug("Restoring vm snapshot " +
snapshot.getSnapshotName() + " on " + vmName + " with XML:\n " + vmSnapshotXML);
+ File tmpCfgFile = null;
+ try {
+ tmpCfgFile = File.createTempFile(vmName + "-", "cfg");
+ final PrintWriter out = new PrintWriter(new
BufferedWriter(new FileWriter(tmpCfgFile)));
+ out.println(vmSnapshotXML);
+ out.close();
+ String cfgFilePath = tmpCfgFile.getAbsolutePath();
+ String cmdvirsh = "virsh snapshot-create --redefine "
+ vmName + (snapshot.getCurrent()? " --current ":" ") + cfgFilePath;
+ int cmdout =
Script.runSimpleBashScriptForExitValue(cmdvirsh);
--- End diff --
Although I understand that the libvirt-java bindings don't have all the
required support, we should not introduce any new cases where we execute
"virsh".
The proper way to do this would be to implement these features in
libvirt-java and depend on a new release of those bindings.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
