[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 4/7] block/nbd: add cmdline and qapi parameter re
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v6 4/7] block/nbd: add cmdline and qapi parameter reconnect-delay |
Date: |
Thu, 11 Apr 2019 20:27:06 +0300 |
Reconnect will be implemented in the following commit, so for now,
in semantics below, disconnect itself is a "serious error".
Signed-off-by: Vladimir Sementsov-Ogievskiy <address@hidden>
---
qapi/block-core.json | 12 +++++++++++-
block/nbd-client.h | 1 +
block/nbd-client.c | 1 +
block/nbd.c | 16 +++++++++++++++-
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index 7ccbfff9d0..815258bd89 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3798,13 +3798,23 @@
# traditional "base:allocation" block status (see
# NBD_OPT_LIST_META_CONTEXT in the NBD protocol) (since 3.0)
#
+# @reconnect-delay: Reconnect delay. On unexpected disconnect, nbd client tries
+# to connect again, until success or serious error. During
+# first @reconnect-delay seconds of reconnecting loop all
+# requests are paused and have a chance to rerun, if
+# successful connect occurs during this time. After
+# @reconnect-delay seconds all delayed requests are failed
+# and all following requests will be failed too (until
+# successful reconnect). Default 0 (Since 4.1)
+#
# Since: 2.9
##
{ 'struct': 'BlockdevOptionsNbd',
'data': { 'server': 'SocketAddress',
'*export': 'str',
'*tls-creds': 'str',
- '*x-dirty-bitmap': 'str' } }
+ '*x-dirty-bitmap': 'str',
+ '*reconnect-delay': 'uint32' } }
##
# @BlockdevOptionsRaw:
diff --git a/block/nbd-client.h b/block/nbd-client.h
index e45b7b0a14..91a6b32bdd 100644
--- a/block/nbd-client.h
+++ b/block/nbd-client.h
@@ -52,6 +52,7 @@ int nbd_client_init(BlockDriverState *bs,
QCryptoTLSCreds *tlscreds,
const char *hostname,
const char *x_dirty_bitmap,
+ uint32_t reconnect_delay,
Error **errp);
void nbd_client_close(BlockDriverState *bs);
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 9f5c86eaa3..1359aff162 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -1218,6 +1218,7 @@ int nbd_client_init(BlockDriverState *bs,
QCryptoTLSCreds *tlscreds,
const char *hostname,
const char *x_dirty_bitmap,
+ uint32_t reconnect_delay,
Error **errp)
{
int ret;
diff --git a/block/nbd.c b/block/nbd.c
index 208be59602..cffb2aee89 100644
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -360,6 +360,18 @@ static QemuOptsList nbd_runtime_opts = {
.help = "experimental: expose named dirty bitmap in place of "
"block status",
},
+ {
+ .name = "reconnect-delay",
+ .type = QEMU_OPT_NUMBER,
+ .help = "Reconnect delay. On unexpected disconnect, nbd client "
+ "tries to connect again, until success or serious error. "
+ "During first @reconnect-delay seconds of reconnecting "
+ "loop all requests are paused and have a chance to rerun, "
+ "if successful connect occurs during this time. After"
+ "@reconnect-delay seconds all delayed requests are failed"
+ "and all following requests will be failed too (until"
+ "successful reconnect). Default 0",
+ },
{ /* end of list */ }
},
};
@@ -411,7 +423,9 @@ static int nbd_open(BlockDriverState *bs, QDict *options,
int flags,
/* NBD handshake */
ret = nbd_client_init(bs, s->saddr, s->export, tlscreds, hostname,
- qemu_opt_get(opts, "x-dirty-bitmap"), errp);
+ qemu_opt_get(opts, "x-dirty-bitmap"),
+ qemu_opt_get_number(opts, "reconnect-delay", 0),
+ errp);
error:
if (tlscreds) {
--
2.18.0
- [Qemu-devel] [PATCH v6 0/7] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 4/7] block/nbd: add cmdline and qapi parameter reconnect-delay,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v6 7/7] iotests: test nbd reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 1/7] block/nbd-client: split connection_co start out of nbd_client_connect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 5/7] qemu-coroutine-sleep: introduce qemu_co_sleep_wake, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 3/7] block/nbd-client: move from quit to state, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 2/7] block/nbd-client: use non-blocking io channel for nbd negotiation, Vladimir Sementsov-Ogievskiy, 2019/04/11
- [Qemu-devel] [PATCH v6 6/7] block/nbd-client: nbd reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/11
- Re: [Qemu-devel] [PATCH v6 0/7] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2019/04/30