External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-27 16:15:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

rbd: Use RBD format 2 by default when creating images.

Browse Source 
We used to look at the librbd code version and depending on that
we would invoke rbd_create3() or rbd_create().

Since librbd version 0.67.9 we can however tell RBD that it should
create rbd format 2 images even if we invoke rbd_create().

The less options we pass to librbd, the more we can lean on the sane
defaults it uses.

For rbd_create3() we had things like the stripe count and unit hardcoded
in libvirt and that might cause problems down the road.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
This commit is contained in:
Wido den Hollander 2015-07-14 10:15:26 +02:00 committed by John Ferlan
parent 0f49f1dc6f
commit 045cac32fd
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/storage/storage_backend_rbd.c
View File

@ -66,6 +66,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
const char *client_mount_timeout = "30"; const char *client_mount_timeout = "30";
const char *mon_op_timeout = "30"; const char *mon_op_timeout = "30";
const char *osd_op_timeout = "30"; const char *osd_op_timeout = "30";
const char *rbd_default_format = "2";
if (authdef) { if (authdef) {
VIR_DEBUG("Using cephx authorization, username: %s", authdef->username); VIR_DEBUG("Using cephx authorization, username: %s", authdef->username);
@ -211,6 +212,14 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr ptr,
VIR_DEBUG("Setting RADOS option rados_osd_op_timeout to %s", osd_op_timeout); VIR_DEBUG("Setting RADOS option rados_osd_op_timeout to %s", osd_op_timeout);
rados_conf_set(ptr->cluster, "rados_osd_op_timeout", osd_op_timeout); rados_conf_set(ptr->cluster, "rados_osd_op_timeout", osd_op_timeout);
/*
* Librbd supports creating RBD format 2 images. We no longer have to invoke
* rbd_create3(), we can tell librbd to default to format 2.
* This leaves us to simply use rbd_create() and use the default behavior of librbd
*/
VIR_DEBUG("Setting RADOS option rbd_default_format to %s", rbd_default_format);
rados_conf_set(ptr->cluster, "rbd_default_format", rbd_default_format);
ptr->starttime = time(0); ptr->starttime = time(0);
r = rados_connect(ptr->cluster); r = rados_connect(ptr->cluster);
if (r < 0) { if (r < 0) {
@ -475,18 +484,8 @@ static int virStorageBackendRBDCreateImage(rados_ioctx_t io,
char *name, long capacity) char *name, long capacity)
{ {
int order = 0; int order = 0;
#if LIBRBD_VERSION_CODE > 260 if (rbd_create(io, name, capacity, &order) < 0)
uint64_t features = 3;
uint64_t stripe_count = 1;
uint64_t stripe_unit = 4194304;
if (rbd_create3(io, name, capacity, features, &order,
stripe_unit, stripe_count) < 0) {
#else
if (rbd_create(io, name, capacity, &order) < 0) {
#endif
return -1; return -1;
}
return 0; return 0;
} }