Commit b172ae2e authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by Eric Blake
Browse files

block/nbd: add cmdline and qapi parameter reconnect-delay 



Reconnect will be implemented in the following commit, so for now,
in semantics below, disconnect itself is a "serious error".

Signed-off-by: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-Id: <20190618114328.55249-5-vsementsov@virtuozzo.com>
[eblake: slipped from 4.1 to 4.2]
Signed-off-by: default avatarEric Blake <eblake@redhat.com>
parent a34b1e5e

block/nbd.c

+15 −1
Original line number Diff line number Diff line
@@ -1275,6 +1275,7 @@ static int nbd_client_init(BlockDriverState *bs, 
                           QCryptoTLSCreds *tlscreds,

                           const char *hostname,

                           const char *x_dirty_bitmap,

                           uint32_t reconnect_delay,

                           Error **errp)

{

    int ret;
@@ -1600,6 +1601,17 @@ static QemuOptsList nbd_runtime_opts = { 
            .help = "experimental: expose named dirty bitmap in place of "

                    "block status",

        },

        {

            .name = "reconnect-delay",

            .type = QEMU_OPT_NUMBER,

            .help = "On an unexpected disconnect, the nbd client tries to "

                    "connect again until succeeding or encountering a serious "

                    "error.  During the first @reconnect-delay seconds, all "

                    "requests are paused and will be rerun on a successful "

                    "reconnect. After that time, any delayed requests and all "

                    "future requests before a successful reconnect will "

                    "immediately fail. Default 0",

        },

        { /* end of list */ }

    },

};
@@ -1651,7 +1663,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) {

qapi/block-core.json

+10 −1
Original line number Diff line number Diff line
@@ -3860,13 +3860,22 @@ 
#                  traditional "base:allocation" block status (see

#                  NBD_OPT_LIST_META_CONTEXT in the NBD protocol) (since 3.0)

#

# @reconnect-delay: On an unexpected disconnect, the nbd client tries to

#                   connect again until succeeding or encountering a serious

#                   error.  During the first @reconnect-delay seconds, all

#                   requests are paused and will be rerun on a successful

#                   reconnect. After that time, any delayed requests and all

#                   future requests before a successful reconnect will

#                   immediately fail. Default 0 (Since 4.2)

#

# 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: