* [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive
@ 2019-07-25 9:49 Vladimir Sementsov-Ogievskiy
2019-07-25 15:26 ` Markus Armbruster
2019-07-29 20:51 ` Eric Blake
0 siblings, 2 replies; 6+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2019-07-25 9:49 UTC (permalink / raw)
To: qemu-devel; +Cc: vsementsov, berrange, armbru, kraxel, den
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(-)
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;
}
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive
2019-07-25 9:49 [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive Vladimir Sementsov-Ogievskiy
@ 2019-07-25 15:26 ` Markus Armbruster
2019-07-25 16:38 ` Eric Blake
2019-07-29 20:51 ` Eric Blake
1 sibling, 1 reply; 6+ messages in thread
From: Markus Armbruster @ 2019-07-25 15:26 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy; +Cc: den, berrange, qemu-devel, kraxel
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>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive
2019-07-25 15:26 ` Markus Armbruster
@ 2019-07-25 16:38 ` Eric Blake
2019-07-25 16:50 ` Daniel P. Berrangé
2019-07-25 19:59 ` Markus Armbruster
0 siblings, 2 replies; 6+ messages in thread
From: Eric Blake @ 2019-07-25 16:38 UTC (permalink / raw)
To: Markus Armbruster, Vladimir Sementsov-Ogievskiy
Cc: den, berrange, qemu-devel, kraxel
[-- Attachment #1.1: Type: text/plain, Size: 718 bytes --]
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.
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive
2019-07-25 16:38 ` Eric Blake
@ 2019-07-25 16:50 ` Daniel P. Berrangé
2019-07-25 19:59 ` Markus Armbruster
1 sibling, 0 replies; 6+ messages in thread
From: Daniel P. Berrangé @ 2019-07-25 16:50 UTC (permalink / raw)
To: Eric Blake
Cc: den, Vladimir Sementsov-Ogievskiy, kraxel, Markus Armbruster, qemu-devel
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
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive
2019-07-25 16:38 ` Eric Blake
2019-07-25 16:50 ` Daniel P. Berrangé
@ 2019-07-25 19:59 ` Markus Armbruster
1 sibling, 0 replies; 6+ messages in thread
From: Markus Armbruster @ 2019-07-25 19:59 UTC (permalink / raw)
To: Eric Blake
Cc: den, Vladimir Sementsov-Ogievskiy, berrange, qemu-devel, kraxel
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive
2019-07-25 9:49 [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive Vladimir Sementsov-Ogievskiy
2019-07-25 15:26 ` Markus Armbruster
@ 2019-07-29 20:51 ` Eric Blake
1 sibling, 0 replies; 6+ messages in thread
From: Eric Blake @ 2019-07-29 20:51 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy, qemu-devel; +Cc: den, berrange, armbru, kraxel
[-- Attachment #1.1: Type: text/plain, Size: 693 bytes --]
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)
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3226
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-07-29 20:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-25 9:49 [Qemu-devel] [PATCH v4] qapi: Add InetSocketAddress member keep-alive Vladimir Sementsov-Ogievskiy
2019-07-25 15:26 ` Markus Armbruster
2019-07-25 16:38 ` Eric Blake
2019-07-25 16:50 ` Daniel P. Berrangé
2019-07-25 19:59 ` Markus Armbruster
2019-07-29 20:51 ` Eric Blake
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).