X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=d3f9fe202a6c73f7a9ba2a7f7281fccb0a1fa7b7;hb=2c93dc32c897a1bf6535a84817a6e5430b51189b;hp=4f7358e623b9dfee4899ffd1e9d46298d52ed41c;hpb=e8a09c095b320c14cf6791c8709c6744d57d9416;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 4f7358e62..d3f9fe202 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2655,7 +2655,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];
@@ -2877,7 +2880,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];
@@ -2985,7 +2990,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];