X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.cpp;h=33684addda431e1f70f7a9d767b26bd9dfab8ea5;hb=556d5faeec58c69a045ecbe7b24e9dda0760aab4;hp=d3f8b3c9e30234a98eed30f49831028a3f9a99bf;hpb=00e71031969e1cef925cd32f81de49ab7213dfec;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.cpp b/src/bin/lttng-relayd/main.cpp
index d3f8b3c9e..33684addd 100644
--- a/src/bin/lttng-relayd/main.cpp
+++ b/src/bin/lttng-relayd/main.cpp
@@ -49,6 +49,7 @@
 #include <common/sessiond-comm/relayd.h>
 #include <common/uri.h>
 #include <common/utils.h>
+#include <common/path.h>
 #include <common/align.h>
 #include <common/ini-config/ini-config.h>
 #include <common/dynamic-buffer.h>
@@ -2663,7 +2664,10 @@ static int relay_rotate_session_streams(
 		 */
 		next_trace_chunk = sessiond_trace_chunk_registry_get_chunk(
 				sessiond_trace_chunk_registry,
-				session->sessiond_uuid, session->id,
+				session->sessiond_uuid,
+				conn->session->id_sessiond.is_set ?
+					conn->session->id_sessiond.value :
+					conn->session->id,
 				rotate_streams.new_chunk_id.value);
 		if (!next_trace_chunk) {
 			char uuid_str[LTTNG_UUID_STR_LEN];
@@ -2885,7 +2889,9 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	published_chunk = sessiond_trace_chunk_registry_publish_chunk(
 			sessiond_trace_chunk_registry,
 			conn->session->sessiond_uuid,
-			conn->session->id,
+			conn->session->id_sessiond.is_set ?
+				conn->session->id_sessiond.value :
+				conn->session->id,
 			chunk);
 	if (!published_chunk) {
 		char uuid_str[LTTNG_UUID_STR_LEN];
@@ -2991,7 +2997,9 @@ static int relay_close_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 	chunk = sessiond_trace_chunk_registry_get_chunk(
 			sessiond_trace_chunk_registry,
 			conn->session->sessiond_uuid,
-			conn->session->id,
+			conn->session->id_sessiond.is_set ?
+				conn->session->id_sessiond.value :
+				conn->session->id,
 			chunk_id);
 	if (!chunk) {
 		char uuid_str[LTTNG_UUID_STR_LEN];