Commit 25d93b6a authored Feb 11, 2019 by Daniel P. Berrangé Committed by Marc-André Lureau Feb 12, 2019

chardev: honour the reconnect setting in tcp_chr_wait_connected



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 <marcandre.lureau@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20190211182442.8542-13-berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>

parent 32423cca

chardev/char-socket.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -957,11 +957,18 @@ 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) {
		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;
		}
		}
		}
		}

		return 0;
		}