From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 8 Aug 2019 20:38:48 +0000 (-0400)
Subject: Fix: use relay_id from ust_session or kernel_session consumer
X-Git-Tag: v2.12.0-rc1~513
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=0a184d4ea76d365036939e7b0c295df0610f80d3

Fix: use relay_id from ust_session or kernel_session consumer

The consumer_output of an ltt_session does not contain the relay
daemon id in the case of a remote session. Hence, it must be fetched
from the domain-specific sessions.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index c4692504b..09953b482 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -715,12 +715,15 @@ int session_close_trace_chunk(const struct ltt_session *session,
 	}
 
 	if (session->ust_session) {
+		const uint64_t relayd_id =
+				session->ust_session->consumer->net_seq_index;
+
 		cds_lfht_for_each_entry(
 				session->ust_session->consumer->socks->ht,
 				&iter, socket, node.node) {
 			pthread_mutex_lock(socket->lock);
 			ret = consumer_close_trace_chunk(socket,
-					session->consumer->net_seq_index,
+					relayd_id,
 					session->id,
 					trace_chunk);
 			pthread_mutex_unlock(socket->lock);
@@ -731,12 +734,15 @@ int session_close_trace_chunk(const struct ltt_session *session,
 		}
 	}
 	if (session->kernel_session) {
+		const uint64_t relayd_id =
+				session->kernel_session->consumer->net_seq_index;
+
 		cds_lfht_for_each_entry(
 				session->kernel_session->consumer->socks->ht,
 				&iter, socket, node.node) {
 			pthread_mutex_lock(socket->lock);
 			ret = consumer_close_trace_chunk(socket,
-					session->consumer->net_seq_index,
+					relayd_id,
 					session->id,
 					trace_chunk);
 			pthread_mutex_unlock(socket->lock);