X-Git-Url: http://git.liburcu.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=05a1dc215f6d01d070a416cdb2ec483f314072d0;hp=c4a62c986946ac09f73fe66108b060b534915ff3;hb=a8b66566890a353cc3a89836281541195ad69d73;hpb=334dfcb7fdb6c4fabb16eea4fb25cf344c063579 diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c index c4a62c986..05a1dc215 100644 --- a/src/bin/lttng-relayd/session.c +++ b/src/bin/lttng-relayd/session.c @@ -19,52 +19,174 @@ #define _LGPL_SOURCE #include -#include #include +#include +#include #include +#include + #include "ctf-trace.h" #include "lttng-relayd.h" #include "session.h" #include "sessiond-trace-chunks.h" #include "stream.h" #include +#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_group_by_host(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; - char *output_path; - bool output_path_allocated = false; - - if (!opt_output_path) { - /* No output path defined */ - 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"); + + 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-, don't append yet another timestamp after + * the session name in the generated path. + * + * Otherwise, generate the path with session_name-. + */ + 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[DATETIME_STR_LEN]; + + ret = time_to_datetime_str( + LTTNG_OPTIONAL_GET(session->creation_time), + session_creation_datetime, + sizeof(session_creation_datetime)); + if (ret) { + ERR("Failed to format session creation timestamp while initializing session output directory handle"); ret = -1; goto end; } - output_path_allocated = true; - } else { - output_path = opt_output_path; - output_path_allocated = false; + + 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 init_session_output_path_group_by_session( + struct relay_session *session) +{ + /* + * session_directory: + * + * session_name/hostname-creation_time/base_path + * + * For session name including the datetime, use it as the complete name + * since. Do not perform modification on it since the datetime is an + * integral part of the name and how a user identify a session. + */ + int ret = 0; + char *session_directory = NULL; + char creation_datetime[DATETIME_STR_LEN]; + + if (session->output_path[0] != '\0') { + /* output_path as been generated already */ + goto end; + } + + ret = time_to_datetime_str(LTTNG_OPTIONAL_GET(session->creation_time), + creation_datetime, sizeof(creation_datetime)); + if (ret) { + ERR("Failed to format session creation timestamp while initializing session output directory handle"); + ret = -1; + goto end; + } + + ret = asprintf(&session_directory, "%s/%s-%s%s%s", + session->session_name, session->hostname, + creation_datetime, + session->base_path[0] != '\0' ? "/" : "", + session->base_path); + 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; } - ret = lttng_directory_handle_init(&output_directory, output_path); + strcpy(session->output_path, session_directory); + ret = 0; + +end: + free(session_directory); + return ret; +} + +static int init_session_output_path(struct relay_session *session) +{ + int ret; + + switch (opt_group_output_by) { + case RELAYD_GROUP_OUTPUT_BY_HOST: + ret = init_session_output_path_group_by_host(session); + break; + case RELAYD_GROUP_OUTPUT_BY_SESSION: + ret = init_session_output_path_group_by_session(session); + break; + case RELAYD_GROUP_OUTPUT_BY_UNKNOWN: + default: + abort(); + break; + } + + 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; } @@ -90,9 +212,6 @@ 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; } @@ -116,17 +235,21 @@ struct relay_session *session_create(const char *session_name, int ret; struct relay_session *session = NULL; - if (session_name && strstr(session_name, ".")) { + assert(session_name); + assert(hostname); + assert(base_path); + + if (strstr(session_name, ".")) { ERR("Illegal character in session name: \"%s\"", session_name); goto error; } - if (base_path && strstr(base_path, "../")) { + if (strstr(base_path, "../")) { ERR("Invalid session base path walks up the path hierarchy: \"%s\"", base_path); goto error; } - if (hostname && strstr(hostname, ".")) { + if (strstr(hostname, ".")) { ERR("Invalid character in hostname: \"%s\"", hostname); goto error; @@ -183,6 +306,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) { @@ -316,6 +447,9 @@ void session_release(struct urcu_ref *ref) void session_put(struct relay_session *session) { + if (!session) { + return; + } rcu_read_lock(); urcu_ref_put(&session->ref, session_release); rcu_read_unlock(); @@ -395,3 +529,38 @@ void print_sessions(void) } 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; +}