[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/5] block/nbd: nbd_co_reconnect_loop(): don't sleep if draine
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 4/5] block/nbd: nbd_co_reconnect_loop(): don't sleep if drained |
Date: |
Mon, 27 Jul 2020 21:47:50 +0300 |
We try to go to wakeable sleep, so that, if drain begins it will break
the sleep. But what if nbd_client_co_drain_begin() already called and
s->drained is already true? We'll go to sleep, and drain will have to
wait for the whole timeout. Let's improve it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---
block/nbd.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/block/nbd.c b/block/nbd.c
index dfe1408b2d..8c5df68856 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -341,8 +341,6 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDState
*s)
qemu_co_queue_restart_all(&s->free_sema);
}
- qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout,
- &s->connection_co_sleep_ns_state);
if (s->drained) {
bdrv_dec_in_flight(s->bs);
s->wait_drained_end = true;
@@ -354,9 +352,12 @@ static coroutine_fn void
nbd_co_reconnect_loop(BDRVNBDState *s)
qemu_coroutine_yield();
}
bdrv_inc_in_flight(s->bs);
- }
- if (timeout < max_timeout) {
- timeout *= 2;
+ } else {
+ qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout,
+ &s->connection_co_sleep_ns_state);
+ if (timeout < max_timeout) {
+ timeout *= 2;
+ }
}
nbd_reconnect_attempt(s);
--
2.21.0
- [PATCH v2 for-5.1? 0/5] Fix nbd reconnect dead-locks, Vladimir Sementsov-Ogievskiy, 2020/07/27
- [PATCH v2 1/5] block/nbd: split nbd_establish_connection out of nbd_client_connect, Vladimir Sementsov-Ogievskiy, 2020/07/27
- [PATCH v2 2/5] block/nbd: allow drain during reconnect attempt, Vladimir Sementsov-Ogievskiy, 2020/07/27
- [PATCH v2 4/5] block/nbd: nbd_co_reconnect_loop(): don't sleep if drained,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 3/5] block/nbd: on shutdown terminate connection attempt, Vladimir Sementsov-Ogievskiy, 2020/07/27
- [PATCH v2 5/5] block/nbd: use non-blocking connect: fix vm hang on connect(), Vladimir Sementsov-Ogievskiy, 2020/07/27
- Re: [PATCH v2 for-5.1? 0/5] Fix nbd reconnect dead-locks, Eric Blake, 2020/07/27