projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: relayd: rotation failure for multi-domain session
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
main.cpp
diff --git
a/src/bin/lttng-relayd/main.cpp
b/src/bin/lttng-relayd/main.cpp
index d3f8b3c9e30234a98eed30f49831028a3f9a99bf..942bfa4d5ab3abded6b6031e0498042e5e1dfbb9 100644
(file)
--- a/
src/bin/lttng-relayd/main.cpp
+++ b/
src/bin/lttng-relayd/main.cpp
@@
-2663,7
+2663,10
@@
static int relay_rotate_session_streams(
*/
next_trace_chunk = sessiond_trace_chunk_registry_get_chunk(
sessiond_trace_chunk_registry,
*/
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];
rotate_streams.new_chunk_id.value);
if (!next_trace_chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
@@
-2885,7
+2888,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,
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];
chunk);
if (!published_chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
@@
-2991,7
+2996,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,
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];
chunk_id);
if (!chunk) {
char uuid_str[LTTNG_UUID_STR_LEN];
This page took
0.024882 seconds
and
4
git commands to generate.