[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 02/10] block/nbd: implement .bdrv_cancel_in_flight
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 02/10] block/nbd: implement .bdrv_cancel_in_flight |
Date: |
Fri, 5 Feb 2021 19:37:12 +0300 |
Just stop waiting for connection in existing requests.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-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 b3cbbeb4b0..c26dc5a54f 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.29.2
- [PATCH v2 00/10] mirror: cancel nbd reconnect, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 01/10] block: add new BlockDriver handler: bdrv_cancel_in_flight, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 02/10] block/nbd: implement .bdrv_cancel_in_flight,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 10/10] iotests/264: add backup-cancel test-case, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 04/10] job: add .cancel handler for the driver, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 05/10] block/mirror: implement .cancel job handler, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 06/10] iotests/264: move to python unittest, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 03/10] block/raw-format: implement .bdrv_cancel_in_flight handler, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 08/10] iotests/264: add mirror-cancel test-case, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 07/10] iotests.py: qemu_nbd_popen: remove pid file after use, Vladimir Sementsov-Ogievskiy, 2021/02/05
- [PATCH v2 09/10] block/backup: implement .cancel job handler, Vladimir Sementsov-Ogievskiy, 2021/02/05