Message ID | 20190725094937.32454-1-vsementsov@virtuozzo.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v4] qapi: Add InetSocketAddress member keep-alive | expand |
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: > It's needed to provide keepalive for nbd client to track server > availability. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Reviewed-by: Markus Armbruster <armbru@redhat.com>
On 7/25/19 10:26 AM, Markus Armbruster wrote: > Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: > >> It's needed to provide keepalive for nbd client to track server >> availability. >> >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > > Reviewed-by: Markus Armbruster <armbru@redhat.com> It looks like this could go in any number of ways (Markus since it touches qapi, Dan since it touches sockets, or me since it was written for use with NBD); but unless anyone complains, I'm happy to queue this through my NBD tree for 4.2.
On Thu, Jul 25, 2019 at 11:38:56AM -0500, Eric Blake wrote: > On 7/25/19 10:26 AM, Markus Armbruster wrote: > > Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: > > > >> It's needed to provide keepalive for nbd client to track server > >> availability. > >> > >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > > > > Reviewed-by: Markus Armbruster <armbru@redhat.com> > > It looks like this could go in any number of ways (Markus since it > touches qapi, Dan since it touches sockets, or me since it was written > for use with NBD); but unless anyone complains, I'm happy to queue this > through my NBD tree for 4.2. I'm fine with you queuing it, since I have nothing pending myself to bundle it up with Acked-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel
Eric Blake <eblake@redhat.com> writes: > On 7/25/19 10:26 AM, Markus Armbruster wrote: >> Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> writes: >> >>> It's needed to provide keepalive for nbd client to track server >>> availability. >>> >>> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> >> >> Reviewed-by: Markus Armbruster <armbru@redhat.com> > > It looks like this could go in any number of ways (Markus since it > touches qapi, Dan since it touches sockets, or me since it was written > for use with NBD); but unless anyone complains, I'm happy to queue this > through my NBD tree for 4.2. Go right ahead.
On 7/25/19 4:49 AM, Vladimir Sementsov-Ogievskiy wrote: > It's needed to provide keepalive for nbd client to track server > availability. > > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > +++ b/util/qemu-sockets.c > @@ -219,6 +219,12 @@ static int inet_listen_saddr(InetSocketAddress *saddr, > bool socket_created = false; > Error *err = NULL; > > + if (saddr->keep_alive) { > + error_setg(errp, "keep-alive options is not supported for passive " option (will fix as part of staging)
diff --git a/qapi/sockets.json b/qapi/sockets.json index fc81d8d5e8..32375f3a36 100644 --- a/qapi/sockets.json +++ b/qapi/sockets.json @@ -53,6 +53,9 @@ # # @ipv6: whether to accept IPv6 addresses, default try both IPv4 and IPv6 # +# @keep-alive: enable keep-alive when connecting to this socket. Not supported +# for passive sockets. (Since 4.2) +# # Since: 1.3 ## { 'struct': 'InetSocketAddress', @@ -61,7 +64,8 @@ '*numeric': 'bool', '*to': 'uint16', '*ipv4': 'bool', - '*ipv6': 'bool' } } + '*ipv6': 'bool', + '*keep-alive': 'bool' } } ## # @UnixSocketAddress: diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index a5092dbd12..35d2b7f773 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -219,6 +219,12 @@ static int inet_listen_saddr(InetSocketAddress *saddr, bool socket_created = false; Error *err = NULL; + if (saddr->keep_alive) { + error_setg(errp, "keep-alive options is not supported for passive " + "sockets"); + return -1; + } + memset(&ai,0, sizeof(ai)); ai.ai_flags = AI_PASSIVE; if (saddr->has_numeric && saddr->numeric) { @@ -458,6 +464,19 @@ int inet_connect_saddr(InetSocketAddress *saddr, Error **errp) } freeaddrinfo(res); + + if (saddr->keep_alive) { + int val = 1; + int ret = qemu_setsockopt(sock, SOL_SOCKET, SO_KEEPALIVE, + &val, sizeof(val)); + + if (ret < 0) { + error_setg_errno(errp, errno, "Unable to set KEEPALIVE"); + close(sock); + return -1; + } + } + return sock; } @@ -653,6 +672,15 @@ int inet_parse(InetSocketAddress *addr, const char *str, Error **errp) } addr->has_ipv6 = true; } + begin = strstr(optstr, ",keep-alive"); + if (begin) { + if (inet_parse_flag("keep-alive", begin + strlen(",keep-alive"), + &addr->keep_alive, errp) < 0) + { + return -1; + } + addr->has_keep_alive = true; + } return 0; }
It's needed to provide keepalive for nbd client to track server availability. Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- Notes: v4; [by Markus's comments] - use "passive socket" term - move check for not enabled keep_alive to inet_listen_saddr() v3: [by Markus's comments] - Fix commit subject - Add comment to qapi and restrict server-side connections - Fix s/"keep-alive="/",keep-alive"/ qapi/sockets.json | 6 +++++- util/qemu-sockets.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-)