[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 4/4] nbd: register yank function earlier
From: |
Eric Blake |
Subject: |
[PULL 4/4] nbd: register yank function earlier |
Date: |
Fri, 9 Jul 2021 09:09:51 -0500 |
From: Lukas Straub <lukasstraub2@web.de>
Although unlikely, qemu might hang in nbd_send_request().
Allow recovery in this case by registering the yank function before
calling it.
Signed-off-by: Lukas Straub <lukasstraub2@web.de>
Message-Id: <20210704000730.1befb596@gecko.fritz.box>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index 601fccc5bacd..f6ff1c4fb472 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -371,6 +371,9 @@ int coroutine_fn
nbd_co_do_establish_connection(BlockDriverState *bs,
return -ECONNREFUSED;
}
+ yank_register_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name), nbd_yank,
+ bs);
+
ret = nbd_handle_updated_info(s->bs, NULL);
if (ret < 0) {
/*
@@ -381,6 +384,8 @@ int coroutine_fn
nbd_co_do_establish_connection(BlockDriverState *bs,
nbd_send_request(s->ioc, &request);
+ yank_unregister_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name),
+ nbd_yank, bs);
object_unref(OBJECT(s->ioc));
s->ioc = NULL;
@@ -390,9 +395,6 @@ int coroutine_fn
nbd_co_do_establish_connection(BlockDriverState *bs,
qio_channel_set_blocking(s->ioc, false, NULL);
qio_channel_attach_aio_context(s->ioc, bdrv_get_aio_context(bs));
- yank_register_function(BLOCKDEV_YANK_INSTANCE(s->bs->node_name), nbd_yank,
- bs);
-
/* successfully connected */
s->state = NBD_CLIENT_CONNECTED;
qemu_co_queue_restart_all(&s->free_sema);
--
2.31.1
- [PULL 0/4] NBD patches for soft freeze, 2021-07-09, Eric Blake, 2021/07/09
- [PULL 1/4] iotests: Improve and rename test 309 to nbd-qemu-allocation, Eric Blake, 2021/07/09
- [PULL 3/4] qemu-img: Reword 'qemu-img map --output=json' docs, Eric Blake, 2021/07/09
- [PULL 4/4] nbd: register yank function earlier,
Eric Blake <=
- [PULL 2/4] qemu-img: Make unallocated part of backing chain obvious in map, Eric Blake, 2021/07/09
- Re: [PULL 0/4] NBD patches for soft freeze, 2021-07-09, Peter Maydell, 2021/07/11