Fix: init_session_output_path is valid for peer >= 2.11 only

[lttng-tools.git] / src / bin / lttng-relayd / session.c

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 605931d5bd82ed449143de9b6f9c6b870bb59a2b..f65450f01aa249a1536818f155a4b97dac9fae6f 100644 (file)
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -28,31 +28,131 @@
 #include "session.h"
 #include "sessiond-trace-chunks.h"
 #include "stream.h"
+#include <common/defaults.h>
 
 /* Global session id used in the session creation. */
 static uint64_t last_relay_session_id;
 static pthread_mutex_t last_relay_session_id_lock = PTHREAD_MUTEX_INITIALIZER;
 
+static int init_session_output_path(struct relay_session *session)
+{
+       /*
+        * session_directory:
+        *
+        * if base_path is \0'
+        *   hostname/session_name
+        * else
+        *   hostname/base_path
+        */
+       char *session_directory = NULL;
+       int ret = 0;
+
+       if (session->output_path[0] != '\0') {
+               goto end;
+       }
+       /*
+        * If base path is set, it overrides the session name for the
+        * session relative base path. No timestamp is appended if the
+        * base path is overridden.
+        *
+        * If the session name already contains the creation time (e.g.
+        * auto-<timestamp>, don't append yet another timestamp after
+        * the session name in the generated path.
+        *
+        * Otherwise, generate the path with session_name-<timestamp>.
+        */
+       if (session->base_path[0] != '\0') {
+               ret = asprintf(&session_directory, "%s/%s", session->hostname,
+                               session->base_path);
+       } else if (session->session_name_contains_creation_time) {
+               ret = asprintf(&session_directory, "%s/%s", session->hostname,
+                               session->session_name);
+       } else {
+               char session_creation_datetime[16];
+               size_t strftime_ret;
+               struct tm *timeinfo;
+               time_t creation_time;
+
+               /*
+                * The 2.11+ protocol guarantees that a creation time
+                * is provided for a session. This would indicate a
+                * protocol error or an improper use of this util.
+                */
+               if (!session->creation_time.is_set) {
+                       ERR("Creation time missing for session \"%s\" (protocol error)",
+                                       session->session_name);
+                       ret = -1;
+                       goto end;
+               }
+               creation_time = LTTNG_OPTIONAL_GET(session->creation_time);
+
+               timeinfo = localtime(&creation_time);
+               if (!timeinfo) {
+                       ERR("Failed to get timeinfo while initializing session output directory handle");
+                       ret = -1;
+                       goto end;
+               }
+               strftime_ret = strftime(session_creation_datetime,
+                               sizeof(session_creation_datetime),
+                               "%Y%m%d-%H%M%S", timeinfo);
+               if (strftime_ret == 0) {
+                       ERR("Failed to format session creation timestamp while initializing session output directory handle");
+                       ret = -1;
+                       goto end;
+               }
+               ret = asprintf(&session_directory, "%s/%s-%s",
+                               session->hostname, session->session_name,
+                               session_creation_datetime);
+       }
+       if (ret < 0) {
+               PERROR("Failed to format session directory name");
+               goto end;
+       }
+
+       if (strlen(session_directory) >= LTTNG_PATH_MAX) {
+               ERR("Session output directory exceeds maximal length");
+               ret = -1;
+               goto end;
+       }
+       strcpy(session->output_path, session_directory);
+       ret = 0;
+
+end:
+       free(session_directory);
+       return ret;
+}
+
 static int session_set_anonymous_chunk(struct relay_session *session)
 {
        int ret = 0;
        struct lttng_trace_chunk *chunk = NULL;
        enum lttng_trace_chunk_status status;
        struct lttng_directory_handle output_directory;
-       const char *base_path = opt_output_path;
+       char *output_path;
+       bool output_path_allocated = false;
 
-       if (base_path == NULL) {
+       if (!opt_output_path) {
                /* No output path defined */
-               base_path = utils_get_home_dir();
-               if (base_path == NULL) {
-                       ERR("Home path not found.\n \
-                                       Please specify an output path using -o, --output PATH");
+               const char *home_dir = utils_get_home_dir();
+               if (!home_dir) {
+                       ERR("Home path not found."
+                                       " Please specify an output path using -o, --output PATH");
                        ret = -1;
                        goto end;
                }
+               ret = asprintf(&output_path, "%s/%s", home_dir, DEFAULT_TRACE_DIR_NAME);
+               if (ret < 0) {
+                       PERROR("asprintf trace dir name");
+                       ret = -1;
+                       goto end;
+               }
+               output_path_allocated = true;
+       } else {
+               output_path = opt_output_path;
+               output_path_allocated = false;
        }
 
-       ret = lttng_directory_handle_init(&output_directory, base_path);
+       ret = lttng_directory_handle_init(&output_directory, output_path);
        if (ret) {
                goto end;
        }
@@ -78,6 +178,9 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 end:
        lttng_trace_chunk_put(chunk);
        lttng_directory_handle_fini(&output_directory);
+       if (output_path_allocated) {
+               free(output_path);
+       }
        return ret;
 }
 
@@ -168,6 +271,14 @@ struct relay_session *session_create(const char *session_name,
                LTTNG_OPTIONAL_SET(&session->id_sessiond, *id_sessiond);
        }
 
+       if (major == 2 && minor >= 11) {
+               /* Only applies for 2.11+ peers using trace chunks. */
+               ret = init_session_output_path(session);
+               if (ret) {
+                       goto error;
+               }
+       }
+
        ret = sessiond_trace_chunk_registry_session_created(
                        sessiond_trace_chunk_registry, sessiond_uuid);
        if (ret) {