X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=241a3c23fea88fbb8f953c0316187a5ba8b631fd;hp=31f27184f5e1abeefb0908dcb330b23d138b9c09;hb=feb33caa78b7d718da8473db204a35227fcdd5c2;hpb=ecd1a12fac39784bded85c0f06e47ace2dc98cde diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c index 31f27184f..241a3c23f 100644 --- a/src/bin/lttng-relayd/session.c +++ b/src/bin/lttng-relayd/session.c @@ -19,22 +19,26 @@ #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 init_session_output_path(struct relay_session *session) +static int init_session_output_path_group_by_host(struct relay_session *session) { /* * session_directory: @@ -68,38 +72,18 @@ static int init_session_output_path(struct relay_session *session) 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; + char session_creation_datetime[DATETIME_STR_LEN]; - /* - * 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) { + 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; } + ret = asprintf(&session_directory, "%s/%s-%s", session->hostname, session->session_name, session_creation_datetime); @@ -122,37 +106,87 @@ end: 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; + } + + 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; - 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"); - 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, output_path); + ret = session_init_output_directory_handle(session, &output_directory); if (ret) { goto end; } @@ -178,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; } @@ -204,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; @@ -271,10 +306,14 @@ struct relay_session *session_create(const char *session_name, LTTNG_OPTIONAL_SET(&session->id_sessiond, *id_sessiond); } - ret = init_session_output_path(session); - if (ret) { - goto error; + 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) { @@ -398,7 +437,7 @@ static void destroy_session(struct relay_session *session) call_rcu(&session->rcu_node, rcu_destroy_session); } -void session_release(struct urcu_ref *ref) +static void session_release(struct urcu_ref *ref) { struct relay_session *session = caa_container_of(ref, struct relay_session, ref); @@ -408,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(); @@ -487,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; +}