[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 08/10] block/nbd: add cmdline and qapi parameter
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[Qemu-devel] [PATCH v4 08/10] block/nbd: add cmdline and qapi parameter reconnect-delay |
Date: |
Tue, 31 Jul 2018 20:30:31 +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 5b9084a394..cf03402ec5 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -3511,13 +3511,23 @@
# traditional "base:allocation" block status (see
# NBD_OPT_LIST_META_CONTEXT in the NBD protocol) (since 3.0)
#
+# @reconnect-delay: Reconnect delay. On 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 occures during this time. After @reconnect-delay
+# seconds all delayed requests are failed and all following
+# requests will be failed to (until successfull reconnect).
+# Default 300 seconds (Since 3.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 e7bda4d3c4..ef8a6a9239 100644
--- a/block/nbd-client.h
+++ b/block/nbd-client.h
@@ -53,6 +53,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 c184a9f0e9..41e6e6e702 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -1079,6 +1079,7 @@ int nbd_client_init(BlockDriverState *bs,
QCryptoTLSCreds *tlscreds,
const char *hostname,
const char *x_dirty_bitmap,
+ uint32_t reconnect_delay,
Error **errp)
{
NBDClientSession *client = nbd_get_client_session(bs);
diff --git a/block/nbd.c b/block/nbd.c
index 9db5eded89..b40fb5a977 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 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 occures during this time. After"
+ "@reconnect-delay seconds all delayed requests are failed"
+ "and all following requests will be failed to (until"
+ "successfull reconnect). Default 300 seconds",
+ },
{ /* 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", 300),
+ errp);
error:
if (tlscreds) {
--
2.11.1
- [Qemu-devel] [PATCH v4 00/10] NBD reconnect, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 05/10] block/nbd-client: don't check ioc, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 08/10] block/nbd: add cmdline and qapi parameter reconnect-delay,
Vladimir Sementsov-Ogievskiy <=
- [Qemu-devel] [PATCH v4 01/10] block/nbd-client: split channel errors from export errors, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 07/10] block/nbd-client: rename read_reply_co to connection_co, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 06/10] block/nbd-client: move from quit to state, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 09/10] block/nbd-client: nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 03/10] block/nbd-client: split connection from initialization, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 04/10] block/nbd-client: fix nbd_reply_chunk_iter_receive, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 02/10] block/nbd: move connection code from block/nbd to block/nbd-client, Vladimir Sementsov-Ogievskiy, 2018/07/31
- [Qemu-devel] [PATCH v4 10/10] iotests: test nbd reconnect, Vladimir Sementsov-Ogievskiy, 2018/07/31