#include <common/compat/uuid.h>
#include <urcu/rculist.h>
+#include <sys/stat.h>
+
#include "ctf-trace.h"
#include "lttng-relayd.h"
#include "session.h"
#include "sessiond-trace-chunks.h"
#include "stream.h"
+#include <common/defaults.h>
+#include "utils.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 session_set_anonymous_chunk(struct relay_session *session)
+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;
- 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;
-
- if (base_path == NULL) {
- /* 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");
+
+ 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;
}
- ret = lttng_directory_handle_init(&output_directory, base_path);
+ 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;
+
+ ret = session_init_output_directory_handle(session, &output_directory);
if (ret) {
goto end;
}
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) {
void session_put(struct relay_session *session)
{
+ if (!session) {
+ return;
+ }
rcu_read_lock();
urcu_ref_put(&session->ref, session_release);
rcu_read_unlock();
}
rcu_read_unlock();
}
+
+int session_init_output_directory_handle(struct relay_session *session,
+ struct lttng_directory_handle *handle)
+{
+ int ret;
+ /*
+ * relayd_output_path/session_directory
+ * e.g. /home/user/lttng-traces/hostname/session_name
+ */
+ char *full_session_path = NULL;
+
+ pthread_mutex_lock(&session->lock);
+ full_session_path = create_output_path(session->output_path);
+ if (!full_session_path) {
+ ret = -1;
+ goto end;
+ }
+
+ ret = utils_mkdir_recursive(
+ full_session_path, S_IRWXU | S_IRWXG, -1, -1);
+ if (ret) {
+ ERR("Failed to create session output path \"%s\"",
+ full_session_path);
+ goto end;
+ }
+
+ ret = lttng_directory_handle_init(handle, full_session_path);
+ if (ret) {
+ goto end;
+ }
+end:
+ pthread_mutex_unlock(&session->lock);
+ free(full_session_path);
+ return ret;
+}
projects / lttng-tools.git / blobdiff