[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/32] block/nbd: connect_thread_func(): do qio_channel_set_de
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v4 04/32] block/nbd: connect_thread_func(): do qio_channel_set_delay(false) |
Date: |
Thu, 10 Jun 2021 13:07:34 +0300 |
nbd_open() does it (through nbd_establish_connection()).
Actually we lost that call on reconnect path in 1dc4718d849e1a1fe
"block/nbd: use non-blocking connect: fix vm hang on connect()"
when we have introduced reconnect thread.
Fixes: 1dc4718d849e1a1fe665ce5241ed79048cfa2cfc
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/nbd.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index 01d2c2efad..f3a036354d 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -408,6 +408,8 @@ static void *connect_thread_func(void *opaque)
thr->sioc = NULL;
}
+ qio_channel_set_delay(QIO_CHANNEL(thr->sioc), false);
+
qemu_mutex_lock(&thr->mutex);
switch (thr->state) {
--
2.29.2
- [PATCH v4 01/32] co-queue: drop extra coroutine_fn marks, (continued)
- [PATCH v4 01/32] co-queue: drop extra coroutine_fn marks, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 02/32] block/nbd: fix channel object leak, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 06/32] block/nbd: call socket_address_parse_named_fd() in advance, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 07/32] block/nbd: ensure ->connection_thread is always valid, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 03/32] block/nbd: fix how state is cleared on nbd_open() failure paths, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 08/32] block/nbd: nbd_client_handshake(): fix leak of s->ioc, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 09/32] block/nbd: BDRVNBDState: drop unused connect_err and connect_status, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 04/32] block/nbd: connect_thread_func(): do qio_channel_set_delay(false),
Vladimir Sementsov-Ogievskiy <=
- [PATCH v4 10/32] block/nbd: simplify waking of nbd_co_establish_connection(), Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 11/32] block/nbd: drop thr->state, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 17/32] nbd: move connection code from block/nbd to nbd/client-connection, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 18/32] nbd/client-connection: use QEMU_LOCK_GUARD, Vladimir Sementsov-Ogievskiy, 2021/06/10
- [PATCH v4 05/32] qemu-sockets: introduce socket_address_parse_named_fd(), Vladimir Sementsov-Ogievskiy, 2021/06/10