Create the session and domain directories on start

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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 9d742536852b4880f30d7245f71d32567a94bc5e..1542fe8e1cb6ae6a91db693a5528338037575390 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -167,14 +167,14 @@ static int get_kernel_runtime_stats(struct ltt_session *session,
                goto end;
        }
 
-       ret = consumer_get_discarded_events(session->id, kchan->fd,
+       ret = consumer_get_discarded_events(session->id, kchan->key,
                        session->kernel_session->consumer,
                        discarded_events);
        if (ret < 0) {
                goto end;
        }
 
-       ret = consumer_get_lost_packets(session->id, kchan->fd,
+       ret = consumer_get_lost_packets(session->id, kchan->key,
                        session->kernel_session->consumer,
                        lost_packets);
        if (ret < 0) {
@@ -784,17 +784,17 @@ static int add_uri_to_consumer(struct consumer_output *consumer,
                break;
        case LTTNG_DST_PATH:
                DBG2("Setting trace directory path from URI to %s", uri->dst.path);
-               memset(consumer->dst.trace_path, 0,
-                               sizeof(consumer->dst.trace_path));
+               memset(consumer->dst.session_root_path, 0,
+                               sizeof(consumer->dst.session_root_path));
                /* Explicit length checks for strcpy and strcat. */
                if (strlen(uri->dst.path) + strlen(default_trace_dir)
-                               >= sizeof(consumer->dst.trace_path)) {
+                               >= sizeof(consumer->dst.session_root_path)) {
                        ret = LTTNG_ERR_FATAL;
                        goto error;
                }
-               strcpy(consumer->dst.trace_path, uri->dst.path);
+               strcpy(consumer->dst.session_root_path, uri->dst.path);
                /* Append default trace dir */
-               strcat(consumer->dst.trace_path, default_trace_dir);
+               strcat(consumer->dst.session_root_path, default_trace_dir);
                /* Flag consumer as local. */
                consumer->type = CONSUMER_DST_LOCAL;
                break;
@@ -2373,6 +2373,113 @@ error:
        return -ret;
 }
 
+static
+int domain_mkdir(const struct consumer_output *output,
+               const struct ltt_session *session,
+               uid_t uid, gid_t gid)
+{
+       struct consumer_socket *socket;
+       struct lttng_ht_iter iter;
+       int ret;
+       char *path = NULL;
+
+       if (!output || !output->socks) {
+               ERR("No consumer output found");
+               ret = -1;
+               goto end;
+       }
+
+       path = zmalloc(LTTNG_PATH_MAX * sizeof(char));
+       if (!path) {
+               ERR("Cannot allocate mkdir path");
+               ret = -1;
+               goto end;
+       }
+
+       ret = snprintf(path, LTTNG_PATH_MAX, "%s%s%s",
+                       session_get_base_path(session),
+                       output->chunk_path, output->subdir);
+       if (ret < 0 || ret >= LTTNG_PATH_MAX) {
+               ERR("Format path");
+               ret = -1;
+               goto end;
+       }
+
+       DBG("Domain mkdir %s for session %" PRIu64, path, session->id);
+       rcu_read_lock();
+       /*
+        * We have to iterate to find a socket, but we only need to send the
+        * rename command to one consumer, so we break after the first one.
+        */
+       cds_lfht_for_each_entry(output->socks->ht, &iter.iter, socket, node.node) {
+               pthread_mutex_lock(socket->lock);
+               ret = consumer_mkdir(socket, session->id, output, path, uid, gid);
+               pthread_mutex_unlock(socket->lock);
+               if (ret) {
+                       ERR("Consumer mkdir");
+                       ret = -1;
+                       goto end_unlock;
+               }
+               break;
+       }
+
+       ret = 0;
+
+end_unlock:
+       rcu_read_unlock();
+end:
+       free(path);
+       return ret;
+}
+
+static
+int session_mkdir(const struct ltt_session *session)
+{
+       int ret;
+       struct consumer_output *output;
+       uid_t uid;
+       gid_t gid;
+
+       /*
+        * Unsupported feature in lttng-relayd before 2.11, not an error since it
+        * is only needed for session rotation and the user will get an error
+        * on rotate.
+        */
+       if (session->consumer->type == CONSUMER_DST_NET &&
+                       session->consumer->relay_major_version == 2 &&
+                       session->consumer->relay_minor_version < 11) {
+               ret = 0;
+               goto end;
+       }
+
+       if (session->kernel_session) {
+               output = session->kernel_session->consumer;
+               uid = session->kernel_session->uid;
+               gid = session->kernel_session->gid;
+               ret = domain_mkdir(output, session, uid, gid);
+               if (ret) {
+                       ERR("Mkdir kernel");
+                       goto end;
+               }
+       }
+
+       if (session->ust_session) {
+               output = session->ust_session->consumer;
+               uid = session->ust_session->uid;
+               gid = session->ust_session->gid;
+               ret = domain_mkdir(output, session, uid, gid);
+               if (ret) {
+                       ERR("Mkdir UST");
+                       goto end;
+               }
+       }
+
+       ret = 0;
+
+end:
+       return ret;
+}
+
 /*
  * Command LTTNG_START_TRACE processed by the client thread.
  *
@@ -2412,8 +2519,20 @@ int cmd_start_trace(struct ltt_session *session)
                goto error;
        }
 
+       if (!session->has_been_started) {
+               if (!session->snapshot_mode && session->output_traces) {
+                       ret = session_mkdir(session);
+                       if (ret) {
+                               ERR("Failed to create the session directories");
+                               ret = LTTNG_ERR_CREATE_DIR_FAIL;
+                               goto error;
+                       }
+               }
+       }
+
        /* Kernel tracing */
        if (ksession != NULL) {
+               DBG("Start kernel tracing session %s", session->name);
                ret = start_kernel_session(ksession, kernel_tracer_fd);
                if (ret != LTTNG_OK) {
                        goto error;
@@ -3099,7 +3218,7 @@ void cmd_list_lttng_sessions(struct lttng_session *sessions, uid_t uid,
                                        sizeof(sessions[i].path), session);
                } else {
                        ret = snprintf(sessions[i].path, sizeof(sessions[i].path), "%s",
-                                       session->consumer->dst.trace_path);
+                                       session->consumer->dst.session_root_path);
                }
                if (ret < 0) {
                        PERROR("snprintf session path");
@@ -3336,7 +3455,7 @@ ssize_t cmd_snapshot_list_outputs(struct ltt_session *session,
                }
                if (output->consumer->type == CONSUMER_DST_LOCAL) {
                        if (lttng_strncpy(list[idx].ctrl_url,
-                                       output->consumer->dst.trace_path,
+                                       output->consumer->dst.session_root_path,
                                        sizeof(list[idx].ctrl_url))) {
                                ret = -LTTNG_ERR_INVALID;
                                goto error;