[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 12/16] chardev: honour the reconnect setting in t
From: |
Daniel P . Berrangé |
Subject: |
[Qemu-devel] [PATCH v3 12/16] chardev: honour the reconnect setting in tcp_chr_wait_connected |
Date: |
Mon, 11 Feb 2019 18:24:38 +0000 |
If establishing a client connection fails, the tcp_chr_wait_connected
method should sleep for the reconnect timeout and then retry the
attempt. This ensures the callers don't immediately abort with an
error when the initial connection fails.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
---
chardev/char-socket.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/chardev/char-socket.c b/chardev/char-socket.c
index d6de5d2305..7db20ff0a0 100644
--- a/chardev/char-socket.c
+++ b/chardev/char-socket.c
@@ -957,8 +957,15 @@ static int tcp_chr_wait_connected(Chardev *chr, Error
**errp)
if (s->is_listen) {
tcp_chr_accept_server_sync(chr);
} else {
- if (tcp_chr_connect_client_sync(chr, errp) < 0) {
- return -1;
+ Error *err = NULL;
+ if (tcp_chr_connect_client_sync(chr, &err) < 0) {
+ if (s->reconnect_time) {
+ error_free(err);
+ g_usleep(s->reconnect_time * 1000ULL * 1000ULL);
+ } else {
+ error_propagate(errp, err);
+ return -1;
+ }
}
}
}
--
2.20.1
- [Qemu-devel] [PATCH v3 02/16] io: add qio_task_wait_thread to join with a background thread, (continued)
- [Qemu-devel] [PATCH v3 02/16] io: add qio_task_wait_thread to join with a background thread, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 03/16] chardev: fix validation of options for QMP created chardevs, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 04/16] chardev: forbid 'reconnect' option with server sockets, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 05/16] chardev: forbid 'wait' option with client sockets, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 06/16] chardev: remove many local variables in qemu_chr_parse_socket, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 07/16] chardev: ensure qemu_chr_parse_compat reports missing driver error, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 08/16] chardev: remove unused 'sioc' variable & cleanup paths, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 09/16] chardev: split tcp_chr_wait_connected into two methods, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 10/16] chardev: split up qmp_chardev_open_socket connection code, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 11/16] chardev: use a state machine for socket connection state, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 12/16] chardev: honour the reconnect setting in tcp_chr_wait_connected,
Daniel P . Berrangé <=
- [Qemu-devel] [PATCH v3 14/16] chardev: fix race with client connections in tcp_chr_wait_connected, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 16/16] chardev: ensure termios is fully initialized, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 13/16] chardev: disallow TLS/telnet/websocket with tcp_chr_wait_connected, Daniel P . Berrangé, 2019/02/11
- [Qemu-devel] [PATCH v3 15/16] tests: expand coverage of socket chardev test, Daniel P . Berrangé, 2019/02/11