From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49165) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZA1Vf-0003i0-0r for qemu-devel@nongnu.org; Tue, 30 Jun 2015 15:48:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZA1Ve-0003du-0k for qemu-devel@nongnu.org; Tue, 30 Jun 2015 15:47:58 -0400 Date: Tue, 30 Jun 2015 15:47:49 -0400 From: Jeff Cody Message-ID: <20150630194749.GF13877@localhost.localdomain> References: <1433993326-26294-1-git-send-email-jdurgin@redhat.com> <1433993326-26294-4-git-send-email-jdurgin@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433993326-26294-4-git-send-email-jdurgin@redhat.com> Subject: Re: [Qemu-devel] [PATCH 3/4] rbd: make qemu's cache setting override any ceph setting List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Josh Durgin Cc: Kevin Wolf , qemu-devel@nongnu.org, qemu-block@nongnu.org On Wed, Jun 10, 2015 at 08:28:45PM -0700, Josh Durgin wrote: > 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 > --- > block/rbd.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > > diff --git a/block/rbd.c b/block/rbd.c > index 50b5f6b..00d027d 100644 > --- a/block/rbd.c > +++ b/block/rbd.c > @@ -460,6 +460,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 > @@ -473,18 +485,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.9.1 > Reviewed-by: Jeff Cody