consumerd: tag metadata channel as being part of a live session

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.c

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 5a6c1d5cf1b44970b611726157460e4be50513de..d282f59c9266e1b22fc0aa581576c8e30d3fd32d 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -913,6 +913,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                unsigned int switch_timer_interval,
                unsigned int read_timer_interval,
                unsigned int live_timer_interval,
+               bool is_in_live_session,
                unsigned int monitor_timer_interval,
                int output,
                int type,
@@ -959,6 +960,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        msg->u.ask_channel.switch_timer_interval = switch_timer_interval;
        msg->u.ask_channel.read_timer_interval = read_timer_interval;
        msg->u.ask_channel.live_timer_interval = live_timer_interval;
+       msg->u.ask_channel.is_live = is_in_live_session;
        msg->u.ask_channel.monitor_timer_interval = monitor_timer_interval;
        msg->u.ask_channel.output = output;
        msg->u.ask_channel.type = type;
@@ -1014,6 +1016,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                uint64_t tracefile_count,
                unsigned int monitor,
                unsigned int live_timer_interval,
+               bool is_in_live_session,
                unsigned int monitor_timer_interval,
                struct lttng_trace_chunk *trace_chunk)
 {
@@ -1043,6 +1046,7 @@ void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        msg->u.channel.tracefile_count = tracefile_count;
        msg->u.channel.monitor = monitor;
        msg->u.channel.live_timer_interval = live_timer_interval;
+       msg->u.channel.is_live = is_in_live_session;
        msg->u.channel.monitor_timer_interval = monitor_timer_interval;
 
        strncpy(msg->u.channel.pathname, pathname,
@@ -1792,6 +1796,7 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
        char creation_timestamp_buffer[ISO8601_STR_LEN];
        const char *creation_timestamp_str = "(none)";
        const bool chunk_has_local_output = relayd_id == -1ULL;
+       enum lttng_trace_chunk_status tc_status;
        struct lttcomm_consumer_msg msg = {
                .cmd_type = LTTNG_CONSUMER_CREATE_TRACE_CHUNK,
                .u.create_trace_chunk.session_id = session_id,
@@ -1869,12 +1874,9 @@ int consumer_create_trace_chunk(struct consumer_socket *socket,
                        ret = -LTTNG_ERR_FATAL;
                        goto error;
                }
-               ret = lttng_directory_handle_create_subdirectory_as_user(
-                               chunk_directory_handle,
-                               domain_subdir,
-                               S_IRWXU | S_IRWXG,
-                               &chunk_credentials);
-               if (ret) {
+               tc_status = lttng_trace_chunk_create_subdirectory(
+                               chunk, domain_subdir);
+               if (tc_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                        PERROR("Failed to create chunk domain output directory \"%s\"",
                                domain_subdir);
                        ret = -LTTNG_ERR_FATAL;