You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2013/07/23 22:24:06 UTC
git commit: updated refs/heads/rbd-snapshotting to fe252f9
Updated Branches:
refs/heads/rbd-snapshotting [created] fe252f9b3
rbd: Allow snapshotting of RBD images
Support backup of RBD snapshots and removal as well
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe252f9b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe252f9b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe252f9b
Branch: refs/heads/rbd-snapshotting
Commit: fe252f9b3559fc836d0080c1ff19ef3a2fd42fb5
Parents: 0c5b698
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Jul 18 18:16:39 2013 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Tue Jul 23 22:23:41 2013 +0200
----------------------------------------------------------------------
.../kvm/resource/LibvirtComputingResource.java | 164 +++++++++++++++----
.../kvm/storage/LibvirtStoragePool.java | 2 +-
pom.xml | 2 +-
3 files changed, 134 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe252f9b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 571bcc8..7ff6812 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.BufferedOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
@@ -242,6 +243,13 @@ import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineName;
+import com.ceph.rados.Rados;
+import com.ceph.rados.RadosException;
+import com.ceph.rados.IoCTX;
+import com.ceph.rbd.Rbd;
+import com.ceph.rbd.RbdImage;
+import com.ceph.rbd.RbdException;
+
/**
* LibvirtComputingResource execute requests on the computing/routing host using
* the libvirt API
@@ -1974,12 +1982,6 @@ ServerResource {
cmd.getPool().getType(),
cmd.getPool().getUuid());
- if (primaryPool.getType() == StoragePoolType.RBD) {
- s_logger.debug("Snapshots are not supported on RBD volumes");
- return new ManageSnapshotAnswer(cmd, false,
- "Snapshots are not supported on RBD volumes");
- }
-
KVMPhysicalDisk disk = primaryPool.getPhysicalDisk(cmd
.getVolumePath());
if (state == DomainInfo.DomainState.VIR_DOMAIN_RUNNING
@@ -2006,23 +2008,63 @@ ServerResource {
vm.resume();
}
} else {
+ /**
+ * For RBD we can't use libvirt to do our snapshotting or any Bash scripts.
+ * libvirt also wants to store the memory contents of the Virtual Machine,
+ * but that's not possible with RBD since there is no way to store the memory
+ * contents in RBD.
+ *
+ * So we rely on the Java bindings for RBD to create our snapshot
+ *
+ * This snapshot might not be 100% consistent due to writes still being in the
+ * memory of the Virtual Machine, but if the VM runs a kernel which supports
+ * barriers properly (>2.6.32) this won't be any different then pulling the power
+ * cord out of a running machine.
+ */
+ if (primaryPool.getType() == StoragePoolType.RBD) {
+ try {
+ Rados r = new Rados(primaryPool.getAuthUserName());
+ r.confSet("mon_host", primaryPool.getSourceHost() + ":" + primaryPool.getSourcePort());
+ r.confSet("key", primaryPool.getAuthSecret());
+ r.connect();
+ s_logger.debug("Succesfully connected to Ceph cluster at " + r.confGet("mon_host"));
+
+ IoCTX io = r.ioCtxCreate(primaryPool.getSourceDir());
+ Rbd rbd = new Rbd(io);
+ RbdImage image = rbd.open(disk.getName());
+
+ if (cmd.getCommandSwitch().equalsIgnoreCase(
+ ManageSnapshotCommand.CREATE_SNAPSHOT)) {
+ s_logger.debug("Attempting to create RBD snapshot " + disk.getName() + "@" + snapshotName);
+ image.snapCreate(snapshotName);
+ } else {
+ s_logger.debug("Attempting to remove RBD snapshot " + disk.getName() + "@" + snapshotName);
+ image.snapRemove(snapshotName);
+ }
- /* VM is not running, create a snapshot by ourself */
- final Script command = new Script(_manageSnapshotPath,
- _cmdsTimeout, s_logger);
- if (cmd.getCommandSwitch().equalsIgnoreCase(
- ManageSnapshotCommand.CREATE_SNAPSHOT)) {
- command.add("-c", disk.getPath());
+ rbd.close(image);
+ r.ioCtxDestroy(io);
+ } catch (Exception e) {
+ s_logger.error("A RBD snapshot operation on " + disk.getName() + " failed. The error was: " + e.getMessage());
+ }
} else {
- command.add("-d", snapshotPath);
- }
+ /* VM is not running, create a snapshot by ourself */
+ final Script command = new Script(_manageSnapshotPath,
+ _cmdsTimeout, s_logger);
+ if (cmd.getCommandSwitch().equalsIgnoreCase(
+ ManageSnapshotCommand.CREATE_SNAPSHOT)) {
+ command.add("-c", disk.getPath());
+ } else {
+ command.add("-d", snapshotPath);
+ }
- command.add("-n", snapshotName);
- String result = command.execute();
- if (result != null) {
- s_logger.debug("Failed to manage snapshot: " + result);
- return new ManageSnapshotAnswer(cmd, false,
- "Failed to manage snapshot: " + result);
+ command.add("-n", snapshotName);
+ String result = command.execute();
+ if (result != null) {
+ s_logger.debug("Failed to manage snapshot: " + result);
+ return new ManageSnapshotAnswer(cmd, false,
+ "Failed to manage snapshot: " + result);
+ }
}
}
return new ManageSnapshotAnswer(cmd, cmd.getSnapshotId(),
@@ -2064,16 +2106,74 @@ ServerResource {
cmd.getPrimaryStoragePoolNameLabel());
KVMPhysicalDisk snapshotDisk = primaryPool.getPhysicalDisk(cmd
.getVolumePath());
- Script command = new Script(_manageSnapshotPath, _cmdsTimeout,
- s_logger);
- command.add("-b", snapshotDisk.getPath());
- command.add("-n", snapshotName);
- command.add("-p", snapshotDestPath);
- command.add("-t", snapshotName);
- String result = command.execute();
- if (result != null) {
- s_logger.debug("Failed to backup snaptshot: " + result);
- return new BackupSnapshotAnswer(cmd, false, result, null, true);
+
+ /**
+ * RBD snapshots can't be copied using qemu-img, so we have to use
+ * the Java bindings for librbd here.
+ *
+ * These bindings will read the snapshot and write the contents to
+ * the secondary storage directly
+ *
+ * It will stop doing so if the amount of time spend is longer then
+ * cmds.timeout
+ */
+ if (primaryPool.getType() == StoragePoolType.RBD) {
+ try {
+ Rados r = new Rados(primaryPool.getAuthUserName());
+ r.confSet("mon_host", primaryPool.getSourceHost() + ":" + primaryPool.getSourcePort());
+ r.confSet("key", primaryPool.getAuthSecret());
+ r.connect();
+ s_logger.debug("Succesfully connected to Ceph cluster at " + r.confGet("mon_host"));
+
+ IoCTX io = r.ioCtxCreate(primaryPool.getSourceDir());
+ Rbd rbd = new Rbd(io);
+ RbdImage image = rbd.open(snapshotDisk.getName(), snapshotName);
+
+ long startTime = System.currentTimeMillis() / 1000;
+
+ File fh = new File(snapshotDestPath);
+ BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(fh));
+ int chunkSize = 4194304;
+ long offset = 0;
+ s_logger.debug("Backuping up RBD snapshot " + snapshotName + " to " + snapshotDestPath);
+ while(true) {
+ byte[] buf = new byte[chunkSize];
+
+ int bytes = image.read(offset, buf, chunkSize);
+ if (bytes <= 0) {
+ break;
+ }
+ bos.write(buf, 0, bytes);
+ offset += bytes;
+ }
+ s_logger.debug("Completed backing up RBD snapshot " + snapshotName + " to " + snapshotDestPath + ". Bytes written: " + offset);
+ bos.close();
+ r.ioCtxDestroy(io);
+ } catch (RadosException e) {
+ s_logger.error("A RADOS operation failed. The error was: " + e.getMessage());
+ return new BackupSnapshotAnswer(cmd, false, e.toString(), null, true);
+ } catch (RbdException e) {
+ s_logger.error("A RBD operation on " + snapshotDisk.getName() + " failed. The error was: " + e.getMessage());
+ return new BackupSnapshotAnswer(cmd, false, e.toString(), null, true);
+ } catch (FileNotFoundException e) {
+ s_logger.error("Failed to open " + snapshotDestPath + ". The error was: " + e.getMessage());
+ return new BackupSnapshotAnswer(cmd, false, e.toString(), null, true);
+ } catch (IOException e) {
+ s_logger.debug("An I/O error occured during a snapshot operation on " + snapshotDestPath);
+ return new BackupSnapshotAnswer(cmd, false, e.toString(), null, true);
+ }
+ } else {
+ Script command = new Script(_manageSnapshotPath, _cmdsTimeout,
+ s_logger);
+ command.add("-b", snapshotDisk.getPath());
+ command.add("-n", snapshotName);
+ command.add("-p", snapshotDestPath);
+ command.add("-t", snapshotName);
+ String result = command.execute();
+ if (result != null) {
+ s_logger.debug("Failed to backup snaptshot: " + result);
+ return new BackupSnapshotAnswer(cmd, false, result, null, true);
+ }
}
/* Delete the snapshot on primary */
@@ -2110,11 +2210,11 @@ ServerResource {
vm.resume();
}
} else {
- command = new Script(_manageSnapshotPath, _cmdsTimeout,
+ Script command = new Script(_manageSnapshotPath, _cmdsTimeout,
s_logger);
command.add("-d", snapshotDisk.getPath());
command.add("-n", snapshotName);
- result = command.execute();
+ String result = command.execute();
if (result != null) {
s_logger.debug("Failed to backup snapshot: " + result);
return new BackupSnapshotAnswer(cmd, false,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe252f9b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
index 2ce5175..bed7b1f 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStoragePool.java
@@ -140,7 +140,7 @@ public class LibvirtStoragePool implements KVMStoragePool {
@Override
public boolean isExternalSnapshot() {
- if (this.type == StoragePoolType.Filesystem) {
+ if (this.type == StoragePoolType.Filesystem || this.type == StoragePoolType.RBD) {
return false;
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe252f9b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ff1d3c0..b6649a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,7 +83,7 @@
<cs.java-ipv6.version>0.10</cs.java-ipv6.version>
<cs.replace.properties>build/replace.properties</cs.replace.properties>
<cs.libvirt-java.version>0.4.9</cs.libvirt-java.version>
- <cs.rados-java.version>0.1.1</cs.rados-java.version>
+ <cs.rados-java.version>0.1.2</cs.rados-java.version>
<cs.target.dir>target</cs.target.dir>
<cs.daemon.version>1.0.10</cs.daemon.version>
</properties>