From: Jianchuan Wang <jianchuan.w...@windriver.com>
Enable to connect to relayd when connecting failed for
allowing multiple connects.
Signed-off-by: Jianchuan Wang <jianchuan.w...@windriver.com>
---
...ow-multiple-attempts-to-connect-to-relayd.patch | 43 ++++++++++++++++++++++
meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb | 1 +
2 files changed, 44 insertions(+)
create mode 100644
meta/recipes-kernel/lttng/lttng-tools/Allow-multiple-attempts-to-connect-to-relayd.patch
diff --git
a/meta/recipes-kernel/lttng/lttng-tools/Allow-multiple-attempts-to-connect-to-relayd.patch
b/meta/recipes-kernel/lttng/lttng-tools/Allow-multiple-attempts-to-connect-to-relayd.patch
new file mode 100644
index 0000000..8d458d6
--- /dev/null
+++
b/meta/recipes-kernel/lttng/lttng-tools/Allow-multiple-attempts-to-connect-to-relayd.patch
@@ -0,0 +1,43 @@
+From 7e9fa50ab3734b63dd62b381e0f17bf6abdd8c40 Mon Sep 17 00:00:00 2001
+From: Jianchuan Wang <jianchuan.w...@windriver.com>
+Date: Fri, 12 Jun 2015 10:05:48 +0800
+Subject: [PATCH] Allow multiple attempts to connect to relayd
+
+It is unclear why a session needs to be made
+unusable after a failure to connect to relayd
+since a check for a relayd connection is
+always made before a session can be configured.
+
+The behaviour was introduced in:
+d9078d0c000d04d49c599a72c1a725026b636ec0
+
+Upstream-Status: Pending
+
+Signed-off-by: Mikael Beckius <mikael.beck...@windriver.com>
+Signed-off-by: Jianchuan Wang <jianchuan.w...@windriver.com>
+---
+ src/bin/lttng-sessiond/cmd.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
+index 044e9ee..53b2bb0 100644
+--- a/src/bin/lttng-sessiond/cmd.c
++++ b/src/bin/lttng-sessiond/cmd.c
+@@ -657,14 +657,6 @@ close_sock:
+ free(rsock);
+
+ error:
+- if (ret != LTTNG_OK) {
+- /*
+- * The consumer output for this session should not be used
anymore
+- * since the relayd connection failed thus making any tracing
or/and
+- * streaming not usable.
+- */
+- consumer->enabled = 0;
+- }
+ return ret;
+ }
+
+--
+1.9.1
+
diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
index 6397a98..0da1faf 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
@@ -28,6 +28,7 @@ SRC_URI =
"git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \
file://extern-decls.patch \
file://run-ptest \
file://lttng-tools-Fix-live-timer-calculation-error.patch \
+ file://Allow-multiple-attempts-to-connect-to-relayd.patch \
"
S = "${WORKDIR}/git"
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
