4567474e95
Notable changes:
* bdrv_co_p{discard,readv,writev,write_zeroes} function signatures
changed, to using int64_t for offsets/bytes and some still had int
rather than BrdvRequestFlags for the flags.
* job_cancel_sync now has a force parameter. Commit messages in
73895f3838cd7fdaf185cf1dbc47be58844a966f
4cfb3f05627ad82af473e7f7ae113c3884cd04e3
sound like using force=true makes more sense.
* Added 3 patches coming in via qemu-stable tag, most important one is
to work around a librbd issue.
* Added another 3 patches from qemu-devel to fix issue leading to
crash when live migrating with iothread.
* cluster_size calculation helper changed (see patch pve/0026).
* QAPI's if conditionals now use 'CONFIG_FOO' rather than
'defined(CONFIG_FOO)'
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Hanna Reitz <hreitz@redhat.com>
|
|
Date: Wed, 9 Feb 2022 15:02:52 +0100
|
|
Subject: [PATCH] block/nbd: Delete reconnect delay timer when done
|
|
|
|
We start the reconnect delay timer to cancel the reconnection attempt
|
|
after a while. Once nbd_co_do_establish_connection() has returned, this
|
|
attempt is over, and we no longer need the timer.
|
|
|
|
Delete it before returning from nbd_reconnect_attempt(), so that it does
|
|
not persist beyond the I/O request that was paused for reconnecting; we
|
|
do not want it to fire in a drained section, because all sort of things
|
|
can happen in such a section (e.g. the AioContext might be changed, and
|
|
we do not want the timer to fire in the wrong context; or the BDS might
|
|
even be deleted, and so the timer CB would access already-freed data).
|
|
|
|
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
---
|
|
block/nbd.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/block/nbd.c b/block/nbd.c
|
|
index 5ef462db1b..b8e5a9b4cc 100644
|
|
--- a/block/nbd.c
|
|
+++ b/block/nbd.c
|
|
@@ -353,6 +353,13 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBDState *s)
|
|
}
|
|
|
|
nbd_co_do_establish_connection(s->bs, NULL);
|
|
+
|
|
+ /*
|
|
+ * The reconnect attempt is done (maybe successfully, maybe not), so
|
|
+ * we no longer need this timer. Delete it so it will not outlive
|
|
+ * this I/O request (so draining removes all timers).
|
|
+ */
|
|
+ reconnect_delay_timer_del(s);
|
|
}
|
|
|
|
static coroutine_fn int nbd_receive_replies(BDRVNBDState *s, uint64_t handle)
|