blob: 0998fc3860c64fe08d741a16f81ab93b3af5f0fc [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 70eff899104b86bae02862927c76caaef5de5d3c Mon Sep 17 00:00:00 2001
2From: Mikael Beckius <mikael.beckius@windriver.com>
3Date: Thu, 7 May 2015 16:14:25 +0200
4Subject: [PATCH] Allow multiple attempts to connect to relayd.
5
6It is unclear why a session needs to be made
7unusable after a failure to connect to relayd
8since a check for a relayd connection is
9always made before a session can be configured.
10
11The behaviour was introduced in:
12d9078d0c000d04d49c599a72c1a725026b636ec0
13
14Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com>
15[ The context has moved, adjust the hunk accordingly ]
16Signed-off-by: He Zhe <zhe.he@windriver.com>
17Upstream-Status: Pending
18---
Brad Bishopf8caae32019-03-25 13:13:56 -040019 src/bin/lttng-sessiond/cmd.c | 8 --------
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020 1 file changed, 8 deletions(-)
21
22diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
Brad Bishopf8caae32019-03-25 13:13:56 -040023index cf30b8e..cc41a48 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080024--- a/src/bin/lttng-sessiond/cmd.c
25+++ b/src/bin/lttng-sessiond/cmd.c
Brad Bishopf8caae32019-03-25 13:13:56 -040026@@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain,
27 */
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080028
Brad Bishopf8caae32019-03-25 13:13:56 -040029 close_sock:
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080030- if (ret != LTTNG_OK) {
31- /*
32- * The consumer output for this session should not be used anymore
33- * since the relayd connection failed thus making any tracing or/and
34- * streaming not usable.
35- */
36- consumer->enabled = 0;
37- }
Brad Bishopf8caae32019-03-25 13:13:56 -040038 (void) relayd_close(rsock);
39 free(rsock);
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080040
41--
Brad Bishopf8caae32019-03-25 13:13:56 -0400422.17.1