|
 |
2bc292 |
From eeb4683ad8c40a03a4e91463ec1d1b651974b744 Mon Sep 17 00:00:00 2001
|
|
|
2bc292 |
From: Hanna Reitz <hreitz@redhat.com>
|
|
|
2bc292 |
Date: Fri, 4 Feb 2022 12:10:06 +0100
|
|
|
2bc292 |
Subject: [PATCH 3/8] block/nbd: Delete reconnect delay timer when done
|
|
|
2bc292 |
|
|
|
2bc292 |
RH-Author: Hanna Reitz <hreitz@redhat.com>
|
|
|
2bc292 |
RH-MergeRequest: 74: block/nbd: Handle AioContext changes
|
|
|
2bc292 |
RH-Commit: [1/6] 34f92910b6ffd256d781109a2b39737fc6ab449c (hreitz/qemu-kvm-c-9-s)
|
|
|
2bc292 |
RH-Bugzilla: 2033626
|
|
|
2bc292 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
2bc292 |
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
|
2bc292 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
2bc292 |
|
|
|
2bc292 |
We start the reconnect delay timer to cancel the reconnection attempt
|
|
|
2bc292 |
after a while. Once nbd_co_do_establish_connection() has returned, this
|
|
|
2bc292 |
attempt is over, and we no longer need the timer.
|
|
|
2bc292 |
|
|
|
2bc292 |
Delete it before returning from nbd_reconnect_attempt(), so that it does
|
|
|
2bc292 |
not persist beyond the I/O request that was paused for reconnecting; we
|
|
|
2bc292 |
do not want it to fire in a drained section, because all sort of things
|
|
|
2bc292 |
can happen in such a section (e.g. the AioContext might be changed, and
|
|
|
2bc292 |
we do not want the timer to fire in the wrong context; or the BDS might
|
|
|
2bc292 |
even be deleted, and so the timer CB would access already-freed data).
|
|
|
2bc292 |
|
|
|
2bc292 |
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
2bc292 |
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
|
2bc292 |
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
2bc292 |
(cherry picked from commit 3ce1fc16bad9c3f8b7b10b451a224d6d76e5c551)
|
|
|
2bc292 |
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
|
2bc292 |
---
|
|
|
2bc292 |
block/nbd.c | 7 +++++++
|
|
|
2bc292 |
1 file changed, 7 insertions(+)
|
|
|
2bc292 |
|
|
|
2bc292 |
diff --git a/block/nbd.c b/block/nbd.c
|
|
|
2bc292 |
index 5ef462db1b..b8e5a9b4cc 100644
|
|
|
2bc292 |
--- a/block/nbd.c
|
|
|
2bc292 |
+++ b/block/nbd.c
|
|
|
2bc292 |
@@ -353,6 +353,13 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
|
|
|
2bc292 |
}
|
|
|
2bc292 |
|
|
|
2bc292 |
nbd_co_do_establish_connection(s->bs, NULL);
|
|
|
2bc292 |
+
|
|
|
2bc292 |
+ /*
|
|
|
2bc292 |
+ * The reconnect attempt is done (maybe successfully, maybe not), so
|
|
|
2bc292 |
+ * we no longer need this timer. Delete it so it will not outlive
|
|
|
2bc292 |
+ * this I/O request (so draining removes all timers).
|
|
|
2bc292 |
+ */
|
|
|
2bc292 |
+ reconnect_delay_timer_del(s);
|
|
|
2bc292 |
}
|
|
|
2bc292 |
|
|
|
2bc292 |
static coroutine_fn int nbd_receive_replies(BDRVNBDState *s, uint64_t handle)
|
|
|
2bc292 |
--
|
|
|
2bc292 |
2.27.0
|
|
|
2bc292 |
|