[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 02/11] block/nbd: implement .bdrv_cancel_in_flight
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 02/11] block/nbd: implement .bdrv_cancel_in_flight |
Date: |
Wed, 18 Nov 2020 21:04:24 +0300 |
Just stop waiting for connection in existing requests.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/nbd.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index 42536702b6..887410b106 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -2419,6 +2419,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",
@@ -2445,6 +2457,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 = {
@@ -2473,6 +2486,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 = {
@@ -2501,6 +2515,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.21.3
- [PATCH 00/11] mirror: cancel nbd reconnect, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 01/11] block: add new BlockDriver handler: bdrv_cancel_in_flight, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 02/11] block/nbd: implement .bdrv_cancel_in_flight,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 03/11] block/raw-format: implement .bdrv_cancel_in_flight handler, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 04/11] job: add .cancel handler for the driver, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 05/11] block/mirror: implement .cancel job handler, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 06/11] iotests/264: fix style, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 07/11] iotests/264: move to python unittest, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 09/11] iotests/264: add mirror-cancel test-case, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 08/11] iotests.py: qemu_nbd_popen: remove pid file after use, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 10/11] block/backup: implement .cancel job handler, Vladimir Sementsov-Ogievskiy, 2020/11/18
- [PATCH 11/11] iotests/264: add backup-cancel test-case, Vladimir Sementsov-Ogievskiy, 2020/11/18
- Re: [PATCH 00/11] mirror: cancel nbd reconnect, Eric Blake, 2020/11/18