Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 1 | From 70eff899104b86bae02862927c76caaef5de5d3c Mon Sep 17 00:00:00 2001 |
| 2 | From: Mikael Beckius <mikael.beckius@windriver.com> |
| 3 | Date: Thu, 7 May 2015 16:14:25 +0200 |
| 4 | Subject: [PATCH] Allow multiple attempts to connect to relayd. |
| 5 | |
| 6 | It is unclear why a session needs to be made |
| 7 | unusable after a failure to connect to relayd |
| 8 | since a check for a relayd connection is |
| 9 | always made before a session can be configured. |
| 10 | |
| 11 | The behaviour was introduced in: |
| 12 | d9078d0c000d04d49c599a72c1a725026b636ec0 |
| 13 | |
| 14 | Signed-off-by: Mikael Beckius <mikael.beckius@windriver.com> |
| 15 | [ The context has moved, adjust the hunk accordingly ] |
| 16 | Signed-off-by: He Zhe <zhe.he@windriver.com> |
| 17 | Upstream-Status: Pending |
| 18 | --- |
Brad Bishop | f8caae3 | 2019-03-25 13:13:56 -0400 | [diff] [blame^] | 19 | src/bin/lttng-sessiond/cmd.c | 8 -------- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 20 | 1 file changed, 8 deletions(-) |
| 21 | |
| 22 | diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c |
Brad Bishop | f8caae3 | 2019-03-25 13:13:56 -0400 | [diff] [blame^] | 23 | index cf30b8e..cc41a48 100644 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | --- a/src/bin/lttng-sessiond/cmd.c |
| 25 | +++ b/src/bin/lttng-sessiond/cmd.c |
Brad Bishop | f8caae3 | 2019-03-25 13:13:56 -0400 | [diff] [blame^] | 26 | @@ -945,14 +945,6 @@ static int send_consumer_relayd_socket(enum lttng_domain_type domain, |
| 27 | */ |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 28 | |
Brad Bishop | f8caae3 | 2019-03-25 13:13:56 -0400 | [diff] [blame^] | 29 | close_sock: |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 30 | - 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 Bishop | f8caae3 | 2019-03-25 13:13:56 -0400 | [diff] [blame^] | 38 | (void) relayd_close(rsock); |
| 39 | free(rsock); |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 40 | |
| 41 | -- |
Brad Bishop | f8caae3 | 2019-03-25 13:13:56 -0400 | [diff] [blame^] | 42 | 2.17.1 |