summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch43
-rw-r--r--meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
new file mode 100644
index 0000000000..62a0978592
--- /dev/null
+++ b/meta/recipes-kernel/lttng/lttng-tools/0001-Allow-multiple-attempts-to-connect-to-relayd.patch
@@ -0,0 +1,43 @@
1From 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---
19 src/bin/lttng-sessiond/cmd.c | 8 --------
20 1 file changed, 8 deletions(-)
21
22diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
23index 73b4ce3..36f62ee 100644
24--- a/src/bin/lttng-sessiond/cmd.c
25+++ b/src/bin/lttng-sessiond/cmd.c
26@@ -689,14 +689,6 @@ close_sock:
27 free(rsock);
28
29 error:
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- }
38 return ret;
39 }
40
41--
421.7.9.5
43
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb b/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
index 93626dd4b5..e4969c3080 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.9.5.bb
@@ -30,6 +30,7 @@ PACKAGECONFIG_remove_riscv64 = "lttng-ust"
30SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \ 30SRC_URI = "https://lttng.org/files/lttng-tools/lttng-tools-${PV}.tar.bz2 \
31 file://x32.patch \ 31 file://x32.patch \
32 file://run-ptest \ 32 file://run-ptest \
33 file://0001-Allow-multiple-attempts-to-connect-to-relayd.patch \
33 " 34 "
34 35
35SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96" 36SRC_URI[md5sum] = "051224eb991aee07f8721ff1877d0b96"