From: Stefano Garzarella <sgarzare@redhat.com> To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com>, Josh Durgin <jdurgin@redhat.com>, Kevin Wolf <kwolf@redhat.com> Subject: [Qemu-devel] [PATCH RFC 1/1] block/rbd: increase dynamically the image size Date: Thu, 11 Apr 2019 12:50:25 +0200 [thread overview] Message-ID: <20190411105025.97397-2-sgarzare@redhat.com> (raw) In-Reply-To: <20190411105025.97397-1-sgarzare@redhat.com> RBD APIs don't allow us to write more than the size set with rbd_create() or rbd_resize(). In order to support growing images (eg. qcow2), we resize the image before RW operations that exceed the current size. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1171007 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- block/rbd.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/block/rbd.c b/block/rbd.c index 0c549c9935..228658e20a 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -102,6 +102,7 @@ typedef struct BDRVRBDState { rbd_image_t image; char *image_name; char *snap; + uint64_t image_size; } BDRVRBDState; static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, @@ -777,6 +778,14 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, goto failed_open; } + r = rbd_get_size(s->image, &s->image_size); + if (r < 0) { + error_setg_errno(errp, -r, "error reading image size from %s", + s->image_name); + rbd_close(s->image); + goto failed_open; + } + /* If we are using an rbd snapshot, we must be r/o, otherwise * leave as-is */ if (s->snap != NULL) { @@ -921,6 +930,20 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, rcb->buf = acb->bounce; } + /* + * RBD APIs don't allow us to write more than actual size, so in order + * to support growing images, we resize the image before RW operations + * that exceed the current size. + */ + if (s->image_size < off + size) { + r = rbd_resize(s->image, off + size); + if (r < 0) { + goto failed; + } + + s->image_size = off + size; + } + acb->ret = 0; acb->error = 0; acb->s = s; @@ -1066,6 +1089,8 @@ static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs, return r; } + s->image_size = offset; + return 0; } -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Stefano Garzarella <sgarzare@redhat.com> To: qemu-devel@nongnu.org Cc: Kevin Wolf <kwolf@redhat.com>, Josh Durgin <jdurgin@redhat.com>, qemu-block@nongnu.org, Max Reitz <mreitz@redhat.com> Subject: [Qemu-devel] [PATCH RFC 1/1] block/rbd: increase dynamically the image size Date: Thu, 11 Apr 2019 12:50:25 +0200 [thread overview] Message-ID: <20190411105025.97397-2-sgarzare@redhat.com> (raw) Message-ID: <20190411105025.FuZ5Qm8bd8QIdDQ1QcdXNRKBy3DM8Ud2pGg5BOXBqH0@z> (raw) In-Reply-To: <20190411105025.97397-1-sgarzare@redhat.com> RBD APIs don't allow us to write more than the size set with rbd_create() or rbd_resize(). In order to support growing images (eg. qcow2), we resize the image before RW operations that exceed the current size. Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=1171007 Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> --- block/rbd.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/block/rbd.c b/block/rbd.c index 0c549c9935..228658e20a 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -102,6 +102,7 @@ typedef struct BDRVRBDState { rbd_image_t image; char *image_name; char *snap; + uint64_t image_size; } BDRVRBDState; static int qemu_rbd_connect(rados_t *cluster, rados_ioctx_t *io_ctx, @@ -777,6 +778,14 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, goto failed_open; } + r = rbd_get_size(s->image, &s->image_size); + if (r < 0) { + error_setg_errno(errp, -r, "error reading image size from %s", + s->image_name); + rbd_close(s->image); + goto failed_open; + } + /* If we are using an rbd snapshot, we must be r/o, otherwise * leave as-is */ if (s->snap != NULL) { @@ -921,6 +930,20 @@ static BlockAIOCB *rbd_start_aio(BlockDriverState *bs, rcb->buf = acb->bounce; } + /* + * RBD APIs don't allow us to write more than actual size, so in order + * to support growing images, we resize the image before RW operations + * that exceed the current size. + */ + if (s->image_size < off + size) { + r = rbd_resize(s->image, off + size); + if (r < 0) { + goto failed; + } + + s->image_size = off + size; + } + acb->ret = 0; acb->error = 0; acb->s = s; @@ -1066,6 +1089,8 @@ static int coroutine_fn qemu_rbd_co_truncate(BlockDriverState *bs, return r; } + s->image_size = offset; + return 0; } -- 2.20.1
next prev parent reply other threads:[~2019-04-11 10:50 UTC|newest] Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-11 10:50 [Qemu-devel] [PATCH RFC 0/1] block/rbd: increase dynamically the image size Stefano Garzarella 2019-04-11 10:50 ` Stefano Garzarella 2019-04-11 10:50 ` Stefano Garzarella [this message] 2019-04-11 10:50 ` [Qemu-devel] [PATCH RFC 1/1] " Stefano Garzarella 2019-04-11 12:35 ` Jason Dillaman 2019-04-11 12:35 ` Jason Dillaman 2019-04-11 13:02 ` Stefano Garzarella 2019-04-11 13:02 ` Stefano Garzarella 2019-04-11 17:06 ` Jason Dillaman 2019-04-11 17:06 ` Jason Dillaman 2019-04-14 13:20 ` Stefano Garzarella 2019-04-14 13:20 ` Stefano Garzarella 2019-04-14 15:14 ` Jason Dillaman 2019-04-14 15:14 ` Jason Dillaman 2019-04-15 8:04 ` Kevin Wolf 2019-04-15 8:04 ` Kevin Wolf 2019-04-17 7:34 ` Stefano Garzarella 2019-04-17 7:34 ` Stefano Garzarella 2019-04-17 8:04 ` Kevin Wolf 2019-04-17 8:04 ` Kevin Wolf 2019-04-19 12:23 ` Stefano Garzarella 2019-04-19 12:23 ` Stefano Garzarella 2019-04-23 7:56 ` Kevin Wolf 2019-04-23 7:56 ` Kevin Wolf 2019-04-23 8:26 ` Stefano Garzarella 2019-04-23 8:26 ` Stefano Garzarella 2019-04-23 8:38 ` Kevin Wolf 2019-04-23 8:38 ` Kevin Wolf 2019-04-29 9:58 ` [Qemu-devel] [Qemu-block] " Kevin Wolf 2019-04-29 9:58 ` Kevin Wolf 2019-04-29 10:11 ` Stefano Garzarella 2019-04-29 10:11 ` Stefano Garzarella 2019-04-29 10:25 ` [Qemu-devel] " Kevin Wolf 2019-04-29 10:25 ` Kevin Wolf 2019-04-29 14:04 ` Stefano Garzarella 2019-04-29 14:04 ` Stefano Garzarella 2019-04-29 14:30 ` Kevin Wolf 2019-04-29 14:30 ` Kevin Wolf 2019-04-29 15:55 ` Stefano Garzarella 2019-04-29 15:55 ` Stefano Garzarella
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190411105025.97397-2-sgarzare@redhat.com \ --to=sgarzare@redhat.com \ --cc=jdurgin@redhat.com \ --cc=kwolf@redhat.com \ --cc=mreitz@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).