From: Eric Blake <eblake@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
"open list:Network Block Dev..." <qemu-block@nongnu.org>,
Max Reitz <mreitz@redhat.com>
Subject: [PULL 06/14] block/nbd: implement .bdrv_cancel_in_flight
Date: Fri, 12 Feb 2021 14:16:11 -0600 [thread overview]
Message-ID: <20210212201619.1388255-7-eblake@redhat.com> (raw)
In-Reply-To: <20210212201619.1388255-1-eblake@redhat.com>
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Just stop waiting for connection in existing requests.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20210205163720.887197-3-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index b3cbbeb4b0cb..c26dc5a54f52 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -2458,6 +2458,18 @@ static const char *const nbd_strong_runtime_opts[] = {
NULL
};
+static void nbd_cancel_in_flight(BlockDriverState *bs)
+{
+ BDRVNBDState *s = (BDRVNBDState *)bs->opaque;
+
+ reconnect_delay_timer_del(s);
+
+ if (s->state == NBD_CLIENT_CONNECTING_WAIT) {
+ s->state = NBD_CLIENT_CONNECTING_NOWAIT;
+ qemu_co_queue_restart_all(&s->free_sema);
+ }
+}
+
static BlockDriver bdrv_nbd = {
.format_name = "nbd",
.protocol_name = "nbd",
@@ -2484,6 +2496,7 @@ static BlockDriver bdrv_nbd = {
.bdrv_co_block_status = nbd_client_co_block_status,
.bdrv_dirname = nbd_dirname,
.strong_runtime_opts = nbd_strong_runtime_opts,
+ .bdrv_cancel_in_flight = nbd_cancel_in_flight,
};
static BlockDriver bdrv_nbd_tcp = {
@@ -2512,6 +2525,7 @@ static BlockDriver bdrv_nbd_tcp = {
.bdrv_co_block_status = nbd_client_co_block_status,
.bdrv_dirname = nbd_dirname,
.strong_runtime_opts = nbd_strong_runtime_opts,
+ .bdrv_cancel_in_flight = nbd_cancel_in_flight,
};
static BlockDriver bdrv_nbd_unix = {
@@ -2540,6 +2554,7 @@ static BlockDriver bdrv_nbd_unix = {
.bdrv_co_block_status = nbd_client_co_block_status,
.bdrv_dirname = nbd_dirname,
.strong_runtime_opts = nbd_strong_runtime_opts,
+ .bdrv_cancel_in_flight = nbd_cancel_in_flight,
};
static void bdrv_nbd_init(void)
--
2.30.1
next prev parent reply other threads:[~2021-02-12 20:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-12 20:16 [PULL 00/14] NBD patches through 2021-02-12 Eric Blake
2021-02-12 20:16 ` [PULL 01/14] qemu-nbd: Use SOMAXCONN for socket listen() backlog Eric Blake
2021-02-12 20:16 ` [PULL 02/14] qemu-nbd: Permit --shared=0 for unlimited clients Eric Blake
2021-02-12 20:16 ` [PULL 03/14] iotests/210: Fix reference output Eric Blake
2021-02-12 20:16 ` [PULL 04/14] io: error_prepend() in qio_channel_readv_full_all() causes segfault Eric Blake
2021-02-12 20:16 ` [PULL 05/14] block: add new BlockDriver handler: bdrv_cancel_in_flight Eric Blake
2021-02-12 20:16 ` Eric Blake [this message]
2021-02-12 20:16 ` [PULL 07/14] block/raw-format: implement .bdrv_cancel_in_flight handler Eric Blake
2021-02-12 20:16 ` [PULL 08/14] job: add .cancel handler for the driver Eric Blake
2021-02-12 20:16 ` [PULL 09/14] block/mirror: implement .cancel job handler Eric Blake
2021-02-12 20:16 ` [PULL 10/14] iotests/264: move to python unittest Eric Blake
2021-02-12 20:16 ` [PULL 11/14] iotests.py: qemu_nbd_popen: remove pid file after use Eric Blake
2021-02-12 20:16 ` [PULL 12/14] iotests/264: add mirror-cancel test-case Eric Blake
2021-02-12 20:16 ` [PULL 13/14] block/backup: implement .cancel job handler Eric Blake
2021-02-12 20:16 ` [PULL 14/14] iotests/264: add backup-cancel test-case Eric Blake
2021-02-13 18:16 ` [PULL 00/14] NBD patches through 2021-02-12 Peter Maydell
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=20210212201619.1388255-7-eblake@redhat.com \
--to=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.