From e5ae6eb23b2f4f0381702e5c45fcd47f77799db1 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Thu, 5 Nov 2015 16:38:59 +0100 Subject: [PATCH 03/44] rbd: make qemu's cache setting override any ceph setting Message-id: <1446741540-2966-2-git-send-email-stefanha@redhat.com> Patchwork-id: 68297 O-Subject: [RHEV-7.2.z qemu-kvm-rhev PATCH 1/2] rbd: make qemu's cache setting override any ceph setting Bugzilla: 1279391 RH-Acked-by: Max Reitz RH-Acked-by: Jeffrey Cody RH-Acked-by: Kevin Wolf From: Josh Durgin To be safe, when cache=none is used ceph settings should not be able to override it to turn on caching. This was previously possible with rbd_cache=true in the rbd device configuration or a ceph configuration file. Similarly, rbd settings could have turned off caching when qemu requested it, although this would just be a performance problem. Fix this by changing rbd's cache setting to match qemu after all other ceph settings have been applied. Signed-off-by: Josh Durgin Reviewed-by: Jeff Cody Signed-off-by: Kevin Wolf (cherry picked from commit 99a3c89d5d538dc6c360e35dffb797cfe06e9cda) Signed-off-by: Stefan Hajnoczi Signed-off-by: Miroslav Rezanina --- block/rbd.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/block/rbd.c b/block/rbd.c index f3ab2dd..929ebb7 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -468,6 +468,18 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, s->snap = g_strdup(snap_buf); } + if (strstr(conf, "conf=") == NULL) { + /* try default location, but ignore failure */ + rados_conf_read_file(s->cluster, NULL); + } + + if (conf[0] != '\0') { + r = qemu_rbd_set_conf(s->cluster, conf, errp); + if (r < 0) { + goto failed_shutdown; + } + } + /* * Fallback to more conservative semantics if setting cache * options fails. Ignore errors from setting rbd_cache because the @@ -481,18 +493,6 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, rados_conf_set(s->cluster, "rbd_cache", "true"); } - if (strstr(conf, "conf=") == NULL) { - /* try default location, but ignore failure */ - rados_conf_read_file(s->cluster, NULL); - } - - if (conf[0] != '\0') { - r = qemu_rbd_set_conf(s->cluster, conf, errp); - if (r < 0) { - goto failed_shutdown; - } - } - r = rados_connect(s->cluster); if (r < 0) { error_setg(errp, "error connecting"); -- 1.8.3.1