[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 2/7] block/nbd: Delete open timer when done
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PULL v2 2/7] block/nbd: Delete open timer when done |
Date: |
Fri, 11 Feb 2022 14:22:35 +0100 |
From: Hanna Reitz <hreitz@redhat.com>
We start the open timer to cancel the connection attempt after a while.
Once nbd_do_establish_connection() has returned, the attempt is over,
and we no longer need the timer.
Delete it before returning from nbd_open(), so that it does not persist
for longer. It has no use after nbd_open(), and just like the reconnect
delay timer, it might well be dangerous if it were to fire afterwards.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/nbd.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/block/nbd.c b/block/nbd.c
index 16cd7fef77..5ff8a57314 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -1885,11 +1885,19 @@ static int nbd_open(BlockDriverState *bs, QDict
*options, int flags,
goto fail;
}
+ /*
+ * The connect attempt is done, so we no longer need this timer.
+ * Delete it, because we do not want it to be around when this node
+ * is drained or closed.
+ */
+ open_timer_del(s);
+
nbd_client_connection_enable_retry(s->conn);
return 0;
fail:
+ open_timer_del(s);
nbd_clear_bdrvstate(bs);
return ret;
}
--
2.31.1
- [PULL v2 0/7] nbd: handle AioContext change correctly, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 6/7] block/nbd: Move s->ioc on AioContext change, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 7/7] iotests/281: Let NBD connection yield in iothread, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 5/7] iotests/281: Test lingering timers, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 1/7] block/nbd: Delete reconnect delay timer when done, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 3/7] block/nbd: Assert there are no timers when closed, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 4/7] iotests.py: Add QemuStorageDaemon class, Vladimir Sementsov-Ogievskiy, 2022/02/11
- [PULL v2 2/7] block/nbd: Delete open timer when done,
Vladimir Sementsov-Ogievskiy <=
- Re: [PULL v2 0/7] nbd: handle AioContext change correctly, Peter Maydell, 2022/02/13