mirrors/libguestfs
1
0
Fork 0
mirror of https://github.com/libguestfs/libguestfs.git synced 2026-03-21 22:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: Handle Ceph/rbd paths properly (RHBZ#1026688).

Browse Source 
The path at the protocol level is:

  pool/disk

(with no leading '/' character).  This is now what you have to pass to
guestfs_add_drive_opts.

Also Ceph can be called with no explicit servers (it uses the contents
of /etc/ceph/ceph.conf instead).  So allow zero servers to be used.
This commit is contained in:
Richard W.M. Jones
2014-01-23 08:28:09 +00:00
parent b93a1d50ad
commit 53a3ff9c00
5 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generator/actions.ml
View File

@@ -1440,7 +1440,7 @@ is a list of server(s).
gluster Exactly one
iscsi Exactly one
nbd Exactly one
rbd One or more
rbd Zero or more
sheepdog Zero or more
ssh Exactly one

9
src/drives.c
View File

@@ -323,11 +323,6 @@ create_drive_rbd (guestfs_h *g,
{
size_t i;
if (nr_servers == 0) {
error (g, _("rbd: you must specify one or more servers"));
return NULL;
}
for (i = 0; i < nr_servers; ++i) {
if (servers[i].transport != drive_transport_none &&
servers[i].transport != drive_transport_tcp) {
@@ -345,8 +340,8 @@ create_drive_rbd (guestfs_h *g,
return NULL;
}
if (exportname[0] != '/') {
error (g, _("rbd: image name must begin with a '/'"));
if (exportname[0] == '/') {
error (g, _("rbd: image name must not begin with a '/'"));
return NULL;
}

2
src/guestfs.pod
View File

@@ -684,7 +684,7 @@ To do this, set the optional C<protocol> and C<server> parameters of
L</guestfs_add_drive_opts> like this:
char **servers = { "ceph1.example.org:3000", /* ... */, NULL };
guestfs_add_drive_opts (g, "/pool/image",
guestfs_add_drive_opts (g, "pool/image",
GUESTFS_ADD_DRIVE_OPTS_FORMAT, "raw",
GUESTFS_ADD_DRIVE_OPTS_PROTOCOL, "rbd",
GUESTFS_ADD_DRIVE_OPTS_SERVER, servers,

10
src/launch-direct.c
View File

@@ -1299,12 +1299,12 @@ guestfs___drive_source_qemu_param (guestfs_h *g, const struct drive_source *src)
}
case drive_protocol_rbd: {
/* build the list of all the mon hosts */
CLEANUP_FREE char *mon_host = NULL, *username = NULL, *secret = NULL;
const char *auth;
size_t n = 0;
size_t i, j;
/* build the list of all the mon hosts */
for (i = 0; i < src->nr_servers; i++) {
n += strlen (src->servers[i].u.hostname);
n += 8; /* for slashes, colons, & port numbers */
@@ -1340,10 +1340,10 @@ guestfs___drive_source_qemu_param (guestfs_h *g, const struct drive_source *src)
else
auth = ":auth_supported=none";
/* Skip the mandatory leading '/' character on exportname. */
return safe_asprintf (g, "rbd:%s:mon_host=%s%s%s%s",
&src->u.exportname[1],
mon_host,
return safe_asprintf (g, "rbd:%s%s%s%s%s%s",
src->u.exportname,
src->nr_servers > 0 ? ":mon_host=" : "",
src->nr_servers > 0 ? mon_host : "",
username ? username : "",
auth,
secret ? secret : "");

10
tests/disks/test-qemu-drive.sh
View File

@@ -47,7 +47,7 @@ rm -f "$DEBUG_QEMU_FILE"
# Ceph (RBD).
$guestfish <<EOF ||:
add "/abc-def/ghi-jkl" "format:raw" "protocol:rbd" \
add "abc-def/ghi-jkl" "format:raw" "protocol:rbd" \
"server:1.2.3.4:1234 1.2.3.5:1235 1.2.3.6:1236"
run
EOF
@@ -55,6 +55,14 @@ check_output
grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:mon_host=1.2.3.4\\:1234\\;1.2.3.5\\:1235\\;1.2.3.6\\:1236:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail
rm "$DEBUG_QEMU_FILE"
$guestfish <<EOF ||:
add "abc-def/ghi-jkl" "format:raw" "protocol:rbd"
run
EOF
check_output
grep -sq -- '-drive file=rbd:abc-def/ghi-jkl:auth_supported=none,' "$DEBUG_QEMU_FILE" || fail
rm "$DEBUG_QEMU_FILE"
# HTTP.
$guestfish <<EOF ||: