You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/02/20 20:17:54 UTC
[48/50] [abbrv] git commit: updated refs/heads/ui-restyle to c64bfa5
Add support for Primary Storage on Gluster using the libvirt backend
The support for Gluster as Primary Storage is mostly based on the
implementation for NFS. Like NFS, libvirt can address a Gluster environment
through the 'netfs' pool-type.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe83a854
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe83a854
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe83a854
Branch: refs/heads/ui-restyle
Commit: fe83a854368fb5161a5edce07607e70c0ff91b4b
Parents: ca68395
Author: Niels de Vos <nd...@redhat.com>
Authored: Wed Nov 20 13:42:18 2013 +0000
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Feb 20 14:52:01 2014 +0100
----------------------------------------------------------------------
api/src/com/cloud/storage/Storage.java | 3 +-
.../kvm/resource/LibvirtComputingResource.java | 16 +++++++++--
.../kvm/resource/LibvirtStoragePoolDef.java | 29 ++++++++++++++++++--
.../resource/LibvirtStoragePoolXMLParser.java | 18 ++++++++++++
.../hypervisor/kvm/resource/LibvirtVMDef.java | 10 +++++--
.../kvm/storage/KVMStorageProcessor.java | 6 ++++
.../kvm/storage/LibvirtStorageAdaptor.java | 27 +++++++++++++-----
...CloudStackPrimaryDataStoreLifeCycleImpl.java | 17 +++++++++++-
8 files changed, 111 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/api/src/com/cloud/storage/Storage.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java
index ff83dfc..8ab2463 100755
--- a/api/src/com/cloud/storage/Storage.java
+++ b/api/src/com/cloud/storage/Storage.java
@@ -98,7 +98,8 @@ public class Storage {
PreSetup(true), // for XenServer, Storage Pool is set up by customers.
EXT(false), // XenServer local EXT SR
OCFS2(true),
- SMB(true);
+ SMB(true),
+ Gluster(true);
boolean shared;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/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 f624379..e6c750b 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
@@ -1750,8 +1750,11 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (pool.getType() == StoragePoolType.CLVM && volFormat == PhysicalDiskFormat.RAW) {
return "CLVM";
- } else if ((poolType == StoragePoolType.NetworkFilesystem || poolType == StoragePoolType.SharedMountPoint || poolType == StoragePoolType.Filesystem) &&
- volFormat == PhysicalDiskFormat.QCOW2) {
+ } else if ((poolType == StoragePoolType.NetworkFilesystem
+ || poolType == StoragePoolType.SharedMountPoint
+ || poolType == StoragePoolType.Filesystem
+ || poolType == StoragePoolType.Gluster)
+ && volFormat == PhysicalDiskFormat.QCOW2 ) {
return "QCOW2";
}
return null;
@@ -3702,6 +3705,12 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
*/
disk.defNetworkBasedDisk(physicalDisk.getPath().replace("rbd:", ""), pool.getSourceHost(), pool.getSourcePort(), pool.getAuthUserName(),
pool.getUuid(), devId, diskBusType, diskProtocol.RBD);
+ } else if (pool.getType() == StoragePoolType.Gluster) {
+ String mountpoint = pool.getLocalPath();
+ String path = physicalDisk.getPath();
+ String glusterVolume = pool.getSourceDir().replace("/", "");
+ disk.defNetworkBasedDisk(glusterVolume + path.replace(mountpoint, ""), pool.getSourceHost(), pool.getSourcePort(), null,
+ null, devId, diskBusType, diskProtocol.GLUSTER);
} else if (pool.getType() == StoragePoolType.CLVM || physicalDisk.getFormat() == PhysicalDiskFormat.RAW) {
disk.defBlockBasedDisk(physicalDisk.getPath(), devId, diskBusType);
} else {
@@ -3859,6 +3868,9 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
if (attachingPool.getType() == StoragePoolType.RBD) {
diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), attachingPool.getAuthUserName(),
attachingPool.getUuid(), devId, DiskDef.diskBus.VIRTIO, diskProtocol.RBD);
+ } else if (attachingPool.getType() == StoragePoolType.Gluster) {
+ diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), null,
+ null, devId, DiskDef.diskBus.VIRTIO, diskProtocol.GLUSTER);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
diskdef.defFileBasedDisk(attachingDisk.getPath(), devId, DiskDef.diskBus.VIRTIO, DiskDef.diskFmtType.QCOW2);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.RAW) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java
index dbe5d4b..7631169 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolDef.java
@@ -18,7 +18,7 @@ package com.cloud.hypervisor.kvm.resource;
public class LibvirtStoragePoolDef {
public enum poolType {
- ISCSI("iscsi"), NETFS("netfs"), LOGICAL("logical"), DIR("dir"), RBD("rbd");
+ ISCSI("iscsi"), NETFS("netfs"), LOGICAL("logical"), DIR("dir"), RBD("rbd"), GLUSTERFS("glusterfs");
String _poolType;
poolType(String poolType) {
@@ -127,7 +127,15 @@ public class LibvirtStoragePoolDef {
@Override
public String toString() {
StringBuilder storagePoolBuilder = new StringBuilder();
- storagePoolBuilder.append("<pool type='" + _poolType + "'>\n");
+ if (_poolType == poolType.GLUSTERFS) {
+ /* libvirt mounts a Gluster volume, similar to NFS */
+ storagePoolBuilder.append("<pool type='netfs'>\n");
+ } else {
+ storagePoolBuilder.append("<pool type='");
+ storagePoolBuilder.append(_poolType);
+ storagePoolBuilder.append("'>\n");
+ }
+
storagePoolBuilder.append("<name>" + _poolName + "</name>\n");
if (_uuid != null)
storagePoolBuilder.append("<uuid>" + _uuid + "</uuid>\n");
@@ -148,6 +156,23 @@ public class LibvirtStoragePoolDef {
}
storagePoolBuilder.append("</source>\n");
}
+ if (_poolType == poolType.GLUSTERFS) {
+ storagePoolBuilder.append("<source>\n");
+ storagePoolBuilder.append("<host name='");
+ storagePoolBuilder.append(_sourceHost);
+ if (_sourcePort != 0) {
+ storagePoolBuilder.append("' port='");
+ storagePoolBuilder.append(_sourcePort);
+ }
+ storagePoolBuilder.append("'/>\n");
+ storagePoolBuilder.append("<dir path='");
+ storagePoolBuilder.append(_sourceDir);
+ storagePoolBuilder.append("'/>\n");
+ storagePoolBuilder.append("<format type='");
+ storagePoolBuilder.append(_poolType);
+ storagePoolBuilder.append("'/>\n");
+ storagePoolBuilder.append("</source>\n");
+ }
if (_poolType != poolType.RBD) {
storagePoolBuilder.append("<target>\n");
storagePoolBuilder.append("<path>" + _targetPath + "</path>\n");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java
index a6186f6..3f7909e 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParser.java
@@ -52,6 +52,7 @@ public class LibvirtStoragePoolXMLParser {
Element source = (Element)rootElement.getElementsByTagName("source").item(0);
String host = getAttrValue("host", "name", source);
+ String format = getAttrValue("format", "type", source);
if (type.equalsIgnoreCase("rbd")) {
int port = Integer.parseInt(getAttrValue("host", "port", source));
@@ -67,6 +68,23 @@ public class LibvirtStoragePoolXMLParser {
} else {
return new LibvirtStoragePoolDef(LibvirtStoragePoolDef.poolType.valueOf(type.toUpperCase()), poolName, uuid, host, port, pool, "");
}
+ /* Gluster is a sub-type of LibvirtStoragePoolDef.poolType.NETFS, need to check format */
+ } else if (format != null && format.equalsIgnoreCase("glusterfs")) {
+ /* libvirt does not return the default port, but requires it for a disk-definition */
+ int port = 24007;
+
+ String path = getAttrValue("dir", "path", source);
+
+ Element target = (Element) rootElement.getElementsByTagName(
+ "target").item(0);
+ String targetPath = getTagValue("path", target);
+
+ String portValue = getAttrValue("host", "port", source);
+ if (portValue != "")
+ port = Integer.parseInt(portValue);
+
+ return new LibvirtStoragePoolDef(LibvirtStoragePoolDef.poolType.valueOf(format.toUpperCase()),
+ poolName, uuid, host, port, path, targetPath);
} else {
String path = getAttrValue("dir", "path", source);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index ff75d61..290c5a9 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -378,7 +378,7 @@ public class LibvirtVMDef {
}
public enum diskProtocol {
- RBD("rbd"), SHEEPDOG("sheepdog");
+ RBD("rbd"), SHEEPDOG("sheepdog"), GLUSTER("gluster");
String _diskProtocol;
diskProtocol(String protocol) {
@@ -664,7 +664,13 @@ public class LibvirtVMDef {
diskBuilder.append(" protocol='" + _diskProtocol + "'");
diskBuilder.append(" name='" + _sourcePath + "'");
diskBuilder.append(">\n");
- diskBuilder.append("<host name='" + _sourceHost + "' port='" + _sourcePort + "'/>\n");
+ diskBuilder.append("<host name='");
+ diskBuilder.append(_sourceHost);
+ if (_sourcePort != 0) {
+ diskBuilder.append("' port='");
+ diskBuilder.append(_sourcePort);
+ }
+ diskBuilder.append("'/>\n");
diskBuilder.append("</source>\n");
if (_authUserName != null) {
diskBuilder.append("<auth username='" + _authUserName + "'>\n");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
----------------------------------------------------------------------
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 8cdecd8..1c37607 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
@@ -931,6 +931,12 @@ public class KVMStorageProcessor implements StorageProcessor {
if (attachingPool.getType() == StoragePoolType.RBD) {
diskdef.defNetworkBasedDisk(attachingDisk.getPath(), attachingPool.getSourceHost(), attachingPool.getSourcePort(), attachingPool.getAuthUserName(),
attachingPool.getUuid(), devId, DiskDef.diskBus.VIRTIO, diskProtocol.RBD);
+ } else if (attachingPool.getType() == StoragePoolType.Gluster) {
+ String mountpoint = attachingPool.getLocalPath();
+ String path = attachingDisk.getPath();
+ String glusterVolume = attachingPool.getSourceDir().replace("/", "");
+ diskdef.defNetworkBasedDisk(glusterVolume + path.replace(mountpoint, ""), attachingPool.getSourceHost(), attachingPool.getSourcePort(), null,
+ null, devId, DiskDef.diskBus.VIRTIO, diskProtocol.GLUSTER);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.QCOW2) {
diskdef.defFileBasedDisk(attachingDisk.getPath(), devId, DiskDef.diskBus.VIRTIO, DiskDef.diskFmtType.QCOW2);
} else if (attachingDisk.getFormat() == PhysicalDiskFormat.RAW) {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
index a5f33eb..4a8f1f1 100644
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/LibvirtStorageAdaptor.java
@@ -129,9 +129,9 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
}
- private StoragePool createNfsStoragePool(Connect conn, String uuid, String host, String path) throws LibvirtException {
+ private StoragePool createNetfsStoragePool(poolType fsType, Connect conn, String uuid, String host, String path) throws LibvirtException {
String targetPath = _mountPoint + File.separator + uuid;
- LibvirtStoragePoolDef spd = new LibvirtStoragePoolDef(poolType.NETFS, uuid, uuid, host, path, targetPath);
+ LibvirtStoragePoolDef spd = new LibvirtStoragePoolDef(fsType, uuid, uuid, host, path, targetPath);
_storageLayer.mkdir(targetPath);
StoragePool sp = null;
try {
@@ -170,7 +170,7 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
}
sp.free();
} catch (LibvirtException l) {
- s_logger.debug("Failed to undefine nfs storage pool with: " + l.toString());
+ s_logger.debug("Failed to undefine " + fsType.toString() + " storage pool with: " + l.toString());
}
}
return null;
@@ -345,14 +345,19 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
type = StoragePoolType.RBD;
} else if (spd.getPoolType() == LibvirtStoragePoolDef.poolType.LOGICAL) {
type = StoragePoolType.CLVM;
+ } else if (spd.getPoolType() == LibvirtStoragePoolDef.poolType.GLUSTERFS) {
+ type = StoragePoolType.Gluster;
}
LibvirtStoragePool pool = new LibvirtStoragePool(uuid, storage.getName(), type, this, storage);
- if (pool.getType() != StoragePoolType.RBD) {
+ if (pool.getType() != StoragePoolType.RBD)
pool.setLocalPath(spd.getTargetPath());
- } else {
+ else
pool.setLocalPath("");
+
+ if (pool.getType() == StoragePoolType.RBD
+ || pool.getType() == StoragePoolType.Gluster) {
pool.setSourceHost(spd.getSourceHost());
pool.setSourcePort(spd.getSourcePort());
pool.setSourceDir(spd.getSourceDir());
@@ -484,9 +489,17 @@ public class LibvirtStorageAdaptor implements StorageAdaptor {
if (type == StoragePoolType.NetworkFilesystem) {
try {
- sp = createNfsStoragePool(conn, name, host, path);
+ sp = createNetfsStoragePool(poolType.NETFS, conn, name, host, path);
+ } catch (LibvirtException e) {
+ s_logger.error("Failed to create netfs mount: " + host + ":" + path , e);
+ s_logger.error(e.getStackTrace());
+ throw new CloudRuntimeException(e.toString());
+ }
+ } else if (type == StoragePoolType.Gluster) {
+ try {
+ sp = createNetfsStoragePool(poolType.GLUSTERFS, conn, name, host, path);
} catch (LibvirtException e) {
- s_logger.error("Failed to create mount");
+ s_logger.error("Failed to create glusterfs mount: " + host + ":" + path , e);
s_logger.error(e.getStackTrace());
throw new CloudRuntimeException(e.toString());
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe83a854/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
index b90d5fc..3c1b76a 100644
--- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
+++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java
@@ -166,6 +166,12 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements PrimaryDataStore
if (uriPath == null) {
throw new InvalidParameterValueException("host or path is null, should be rbd://hostname/pool");
}
+ } else if (uri.getScheme().equalsIgnoreCase("gluster")) {
+ String uriHost = uri.getHost();
+ String uriPath = uri.getPath();
+ if (uriHost == null || uriPath == null || uriHost.trim().isEmpty() || uriPath.trim().isEmpty()) {
+ throw new InvalidParameterValueException("host or path is null, should be gluster://hostname/volume");
+ }
}
} catch (URISyntaxException e) {
throw new InvalidParameterValueException(url + " is not a valid uri");
@@ -288,6 +294,14 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements PrimaryDataStore
parameters.setHost("clustered");
parameters.setPort(port);
parameters.setPath(hostPath);
+ } else if (scheme.equalsIgnoreCase("gluster")) {
+ if (port == -1) {
+ port = 24007;
+ }
+ parameters.setType(StoragePoolType.Gluster);
+ parameters.setHost(storageHost);
+ parameters.setPort(port);
+ parameters.setPath(hostPath);
} else {
StoragePoolType type = Enum.valueOf(StoragePoolType.class, scheme);
@@ -349,7 +363,8 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements PrimaryDataStore
if (pool.getPoolType() != StoragePoolType.NetworkFilesystem && pool.getPoolType() != StoragePoolType.Filesystem &&
pool.getPoolType() != StoragePoolType.IscsiLUN && pool.getPoolType() != StoragePoolType.Iscsi && pool.getPoolType() != StoragePoolType.VMFS &&
pool.getPoolType() != StoragePoolType.SharedMountPoint && pool.getPoolType() != StoragePoolType.PreSetup && pool.getPoolType() != StoragePoolType.OCFS2 &&
- pool.getPoolType() != StoragePoolType.RBD && pool.getPoolType() != StoragePoolType.CLVM && pool.getPoolType() != StoragePoolType.SMB) {
+ pool.getPoolType() != StoragePoolType.RBD && pool.getPoolType() != StoragePoolType.CLVM && pool.getPoolType() != StoragePoolType.SMB &&
+ pool.getPoolType() != StoragePoolType.Gluster) {
s_logger.warn(" Doesn't support storage pool type " + pool.getPoolType());
return false;
}