From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Wed, 4 Sep 2019 22:30:00 +0000 (-0400)
Subject: Fix: lttng_directory_handle_init fails on opening base relayd output
X-Git-Tag: v2.12.0-rc1~444
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=d37856b8d3033144818786de1c5c5b898fe2946e

Fix: lttng_directory_handle_init fails on opening base relayd output

lttng_directory_handle_init, called from session_set_anonymous_chunk,
fails to open "$LTTNG_HOME/lttng-traces" directory as the folder is
not yet created at this time.

Rename init_session_output_directory_handle to
session_init_output_directory_handle and move it to session.h

For an anonymous chunk, the session->output_path is empty.  The
resulting output directory handle is at the "root" node of the
lttng-relayd chosen output.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 09e1b7963..453bf6d20 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2298,40 +2298,7 @@ end_no_reply:
 	return ret;
 }
 
-static int init_session_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;
-}
 
 /*
  * relay_create_trace_chunk: create a new trace chunk
@@ -2418,7 +2385,7 @@ static int relay_create_trace_chunk(const struct lttcomm_relayd_hdr *recv_hdr,
 		}
 	}
 
-	ret = init_session_output_directory_handle(
+	ret = session_init_output_directory_handle(
 			conn->session, &session_output);
 	if (ret) {
 		reply_code = LTTNG_ERR_CREATE_DIR_FAIL;
diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index f65450f01..af2278d46 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -23,12 +23,15 @@
 #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;
@@ -128,31 +131,8 @@ static int session_set_anonymous_chunk(struct relay_session *session)
 	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 +158,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;
 }
 
@@ -491,3 +468,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;
+}
diff --git a/src/bin/lttng-relayd/session.h b/src/bin/lttng-relayd/session.h
index 2a034daf3..288672dcc 100644
--- a/src/bin/lttng-relayd/session.h
+++ b/src/bin/lttng-relayd/session.h
@@ -154,6 +154,9 @@ void session_put(struct relay_session *session);
 int session_close(struct relay_session *session);
 int session_abort(struct relay_session *session);
 
+int session_init_output_directory_handle(struct relay_session *session,
+		struct lttng_directory_handle *handle);
+
 void print_sessions(void);
 
 #endif /* _SESSION_H */