[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 14/25] chardev: honour the reconnect setting in tc
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL v2 14/25] chardev: honour the reconnect setting in tcp_chr_wait_connected |
Date: |
Wed, 13 Feb 2019 17:19:02 +0100 |
From: Daniel P. Berrangé <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Marc-André Lureau <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.21.0.rc0.1.g036caf7885
- [Qemu-devel] [PULL v2 07/25] chardev: forbid 'wait' option with client sockets, (continued)
- [Qemu-devel] [PULL v2 07/25] chardev: forbid 'wait' option with client sockets, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 08/25] chardev: remove many local variables in qemu_chr_parse_socket, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 02/25] tests/test-char: add muxed chardev testing for open/close, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 09/25] chardev: ensure qemu_chr_parse_compat reports missing driver error, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 05/25] chardev: fix validation of options for QMP created chardevs, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 03/25] io: store reference to thread information in the QIOTask struct, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 01/25] chardev: fix mess in OPENED/CLOSED events when muxed, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 06/25] chardev: forbid 'reconnect' option with server sockets, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 12/25] chardev: split up qmp_chardev_open_socket connection code, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 11/25] chardev: split tcp_chr_wait_connected into two methods, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 14/25] chardev: honour the reconnect setting in tcp_chr_wait_connected,
Marc-André Lureau <=
- [Qemu-devel] [PULL v2 13/25] chardev: use a state machine for socket connection state, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 15/25] chardev: disallow TLS/telnet/websocket with tcp_chr_wait_connected, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 18/25] chardev: ensure termios is fully initialized, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 16/25] chardev: fix race with client connections in tcp_chr_wait_connected, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 17/25] tests: expand coverage of socket chardev test, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 20/25] chardev/wctablet: Fix a typo, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 22/25] terminal3270: do not use backend timer sources, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 21/25] char: update the mux handlers in class callback, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 19/25] char: allow specifying a GMainContext at opening time, Marc-André Lureau, 2019/02/13
- [Qemu-devel] [PULL v2 23/25] chardev: add a note about frontend sources and context switch, Marc-André Lureau, 2019/02/13