[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/18] chardev: honour the reconnect setting in tcp_c
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PULL 12/18] chardev: honour the reconnect setting in tcp_chr_wait_connected |
Date: |
Thu, 7 Feb 2019 17:06:11 +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>
---
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.519.g8feddda32c
- [Qemu-devel] [PULL 06/18] chardev: remove many local variables in qemu_chr_parse_socket, (continued)
- [Qemu-devel] [PULL 06/18] chardev: remove many local variables in qemu_chr_parse_socket, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 07/18] chardev: ensure qemu_chr_parse_compat reports missing driver error, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 04/18] chardev: forbid 'reconnect' option with server sockets, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 09/18] chardev: split tcp_chr_wait_connected into two methods, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 10/18] chardev: split up qmp_chardev_open_socket connection code, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 05/18] chardev: forbid 'wait' option with client sockets, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 02/18] io: add qio_task_wait_thread to join with a background thread, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 08/18] chardev: remove unused 'sioc' variable & cleanup paths, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 01/18] io: store reference to thread information in the QIOTask struct, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 11/18] chardev: use a state machine for socket connection state, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 12/18] chardev: honour the reconnect setting in tcp_chr_wait_connected,
Marc-André Lureau <=
- [Qemu-devel] [PULL 13/18] chardev: disallow TLS/telnet/websocket with tcp_chr_wait_connected, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 14/18] chardev: fix race with client connections in tcp_chr_wait_connected, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 16/18] chardev: ensure termios is fully initialized, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 18/18] tests/test-char: add muxed chardev testing for open/close, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 17/18] chardev: fix mess in OPENED/CLOSED events when muxed, Marc-André Lureau, 2019/02/07
- [Qemu-devel] [PULL 15/18] tests: expand coverage of socket chardev test, Marc-André Lureau, 2019/02/07
- Re: [Qemu-devel] [PULL 00/18] Chardev patches, Peter Maydell, 2019/02/08
- Re: [Qemu-devel] [PULL 00/18] Chardev patches, Daniel P . Berrangé, 2019/02/11