[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(
From: |
Eric Blake |
Subject: |
[PULL 06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(false) |
Date: |
Tue, 15 Jun 2021 15:47:28 -0500 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
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>
Message-Id: <20210610100802.5888-5-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index 01d2c2efad63..f3a036354dc7 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.31.1
- [PULL 00/34] NBD patches for 2021-06-15, Eric Blake, 2021/06/15
- [PULL 03/34] co-queue: drop extra coroutine_fn marks, Eric Blake, 2021/06/15
- [PULL 02/34] tests: cover aio_co_enter from a worker thread without BQL taken, Eric Blake, 2021/06/15
- [PULL 04/34] block/nbd: fix channel object leak, Eric Blake, 2021/06/15
- [PULL 01/34] async: the main AioContext is only "current" if under the BQL, Eric Blake, 2021/06/15
- [PULL 05/34] block/nbd: fix how state is cleared on nbd_open() failure paths, Eric Blake, 2021/06/15
- [PULL 07/34] qemu-sockets: introduce socket_address_parse_named_fd(), Eric Blake, 2021/06/15
- [PULL 06/34] block/nbd: connect_thread_func(): do qio_channel_set_delay(false),
Eric Blake <=
- [PULL 10/34] block/nbd: nbd_client_handshake(): fix leak of s->ioc, Eric Blake, 2021/06/15
- [PULL 09/34] block/nbd: ensure ->connection_thread is always valid, Eric Blake, 2021/06/15
- [PULL 08/34] block/nbd: call socket_address_parse_named_fd() in advance, Eric Blake, 2021/06/15
- [PULL 11/34] block/nbd: BDRVNBDState: drop unused connect_err and connect_status, Eric Blake, 2021/06/15
- [PULL 12/34] block/nbd: simplify waking of nbd_co_establish_connection(), Eric Blake, 2021/06/15
- [PULL 13/34] block/nbd: drop thr->state, Eric Blake, 2021/06/15
- [PULL 14/34] block/nbd: bs-independent interface for nbd_co_establish_connection(), Eric Blake, 2021/06/15
- [PULL 15/34] block/nbd: make nbd_co_establish_connection_cancel() bs-independent, Eric Blake, 2021/06/15
- [PULL 17/34] block/nbd: introduce nbd_client_connection_new(), Eric Blake, 2021/06/15
- [PULL 18/34] block/nbd: introduce nbd_client_connection_release(), Eric Blake, 2021/06/15