X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Frelayd%2Frelayd.c;h=8e6b71173052436103275898c4fe5ec02e02c2f5;hp=363a0e7b6dc02f8214d92175f64f4d06d48aa5b8;hb=070b6a86970c981e8f79cbd3dc199008b25cc0dc;hpb=c35f9726a22f1d93e14589688d830efccda196f3

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 363a0e7b6..8e6b71173 100644
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -34,6 +34,17 @@
 
 #include "relayd.h"
 
+static
+bool relayd_supports_chunks(const struct lttcomm_relayd_sock *sock)
+{
+	if (sock->major > 2) {
+		return true;
+	} else if (sock->major == 2 && sock->minor >= 11) {
+		return true;
+	}
+	return false;
+}
+
 /*
  * Send command. Fill up the header and append the data.
  */
@@ -122,29 +133,35 @@ error:
 }
 
 /*
- * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name & hostname)
- * have no length restriction on the sender side.
+ * Starting from 2.11, RELAYD_CREATE_SESSION payload (session_name,
+ * hostname, and base_path) have no length restriction on the sender side.
  * Length for both payloads is stored in the msg struct. A new dynamic size
  * payload size is introduced.
  */
 static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 		const char *session_name, const char *hostname,
-		int session_live_timer, unsigned int snapshot,
-		uint64_t sessiond_session_id, const lttng_uuid sessiond_uuid,
-		const uint64_t *current_chunk_id,
-		time_t creation_time)
+		const char *base_path, int session_live_timer,
+		unsigned int snapshot, uint64_t sessiond_session_id,
+		const lttng_uuid sessiond_uuid, const uint64_t *current_chunk_id,
+		time_t creation_time, bool session_name_contains_creation_time)
 {
 	int ret;
 	struct lttcomm_relayd_create_session_2_11 *msg = NULL;
 	size_t session_name_len;
 	size_t hostname_len;
+	size_t base_path_len;
 	size_t msg_length;
+	char *dst;
 
-	/* The two names are sent with a '\0' delimiter between them. */
+	if (!base_path) {
+		base_path = "";
+	}
+	/* The three names are sent with a '\0' delimiter between them. */
 	session_name_len = strlen(session_name) + 1;
 	hostname_len = strlen(hostname) + 1;
+	base_path_len = base_path ? strlen(base_path) + 1 : 0;
 
-	msg_length = sizeof(*msg) + session_name_len + hostname_len;
+	msg_length = sizeof(*msg) + session_name_len + hostname_len + base_path_len;
 	msg = zmalloc(msg_length);
 	if (!msg) {
 		PERROR("zmalloc create_session_2_11 command message");
@@ -158,11 +175,21 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 	assert(hostname_len <= UINT32_MAX);
 	msg->hostname_len = htobe32(hostname_len);
 
-	if (lttng_strncpy(msg->names, session_name, session_name_len)) {
+	assert(base_path_len <= UINT32_MAX);
+	msg->base_path_len = htobe32(base_path_len);
+
+	dst = msg->names;
+	if (lttng_strncpy(dst, session_name, session_name_len)) {
+		ret = -1;
+		goto error;
+	}
+	dst += session_name_len;
+	if (lttng_strncpy(dst, hostname, hostname_len)) {
 		ret = -1;
 		goto error;
 	}
-	if (lttng_strncpy(msg->names + session_name_len, hostname, hostname_len)) {
+	dst += hostname_len;
+	if (base_path && lttng_strncpy(dst, base_path, base_path_len)) {
 		ret = -1;
 		goto error;
 	}
@@ -172,7 +199,7 @@ static int relayd_create_session_2_11(struct lttcomm_relayd_sock *rsock,
 
 	lttng_uuid_copy(msg->sessiond_uuid, sessiond_uuid);
 	msg->session_id = htobe64(sessiond_session_id);
-
+	msg->session_name_contains_creation_time = session_name_contains_creation_time;
 	if (current_chunk_id) {
 		LTTNG_OPTIONAL_SET(&msg->current_chunk_id,
 				htobe64(*current_chunk_id));
@@ -249,11 +276,11 @@ error:
 int relayd_create_session(struct lttcomm_relayd_sock *rsock,
 		uint64_t *relayd_session_id,
 		const char *session_name, const char *hostname,
-		int session_live_timer,
+		const char *base_path, int session_live_timer,
 		unsigned int snapshot, uint64_t sessiond_session_id,
 		const lttng_uuid sessiond_uuid,
 		const uint64_t *current_chunk_id,
-		time_t creation_time)
+		time_t creation_time, bool session_name_contains_creation_time)
 {
 	int ret;
 	struct lttcomm_relayd_status_session reply;
@@ -273,9 +300,10 @@ int relayd_create_session(struct lttcomm_relayd_sock *rsock,
 	} else {
 		/* From 2.11 to ... */
 		ret = relayd_create_session_2_11(rsock, session_name,
-				hostname, session_live_timer, snapshot,
+				hostname, base_path, session_live_timer, snapshot,
 				sessiond_session_id, sessiond_uuid,
-				current_chunk_id, creation_time);
+				current_chunk_id, creation_time,
+				session_name_contains_creation_time);
 	}
 
 	if (ret < 0) {
@@ -425,6 +453,10 @@ error:
 /*
  * Add stream on the relayd and assign stream handle to the stream_id argument.
  *
+ * Chunks are not supported by relayd prior to 2.11, but are used to
+ * internally between session daemon and consumer daemon to keep track
+ * of the channel and stream output path.
+ *
  * On success return 0 else return ret_code negative value.
  */
 int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_name,
@@ -439,25 +471,23 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
 	assert(rsock);
 	assert(channel_name);
 	assert(pathname);
+	assert(trace_chunk);
 
 	DBG("Relayd adding stream for channel name %s", channel_name);
 
 	/* Compat with relayd 2.1 */
 	if (rsock->minor == 1) {
 		/* For 2.1 */
-		assert(!trace_chunk);
 		ret = relayd_add_stream_2_1(rsock, channel_name, pathname);
 	
 	} else if (rsock->minor > 1 && rsock->minor < 11) {
 		/* From 2.2 to 2.10 */
-		assert(!trace_chunk);
 		ret = relayd_add_stream_2_2(rsock, channel_name, pathname,
 				tracefile_size, tracefile_count);
 	} else {
 		enum lttng_trace_chunk_status chunk_status;
 		uint64_t chunk_id;
 
-		assert(trace_chunk);
 		chunk_status = lttng_trace_chunk_get_id(trace_chunk,
 				&chunk_id);
 		assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
@@ -1123,7 +1153,7 @@ error:
 }
 
 int relayd_rotate_streams(struct lttcomm_relayd_sock *sock,
-		unsigned int stream_count, uint64_t *new_chunk_id,
+		unsigned int stream_count, const uint64_t *new_chunk_id,
 		const struct relayd_stream_rotation_position *positions)
 {
 	int ret;
@@ -1140,6 +1170,11 @@ int relayd_rotate_streams(struct lttcomm_relayd_sock *sock,
 	char new_chunk_id_buf[MAX_INT_DEC_LEN(*new_chunk_id)] = {};
 	const char *new_chunk_id_str;
 
+	if (!relayd_supports_chunks(sock)) {
+		DBG("Refusing to rotate remote streams: relayd does not support chunks");
+		return 0;
+	}
+
 	lttng_dynamic_buffer_init(&payload);
 
 	/* Code flow error. Safety net. */
@@ -1228,10 +1263,15 @@ int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
 	time_t creation_timestamp;
 	const char *chunk_name;
 	size_t chunk_name_length;
-	bool overriden_name;
+	bool overridden_name;
 
 	lttng_dynamic_buffer_init(&payload);
 
+	if (!relayd_supports_chunks(sock)) {
+		DBG("Refusing to create remote trace chunk: relayd does not support chunks");
+		goto end;
+	}
+
 	status = lttng_trace_chunk_get_id(chunk, &chunk_id);
 	if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 		ret = -1;
@@ -1246,14 +1286,14 @@ int relayd_create_trace_chunk(struct lttcomm_relayd_sock *sock,
 	}
 
 	status = lttng_trace_chunk_get_name(
-			chunk, &chunk_name, &overriden_name);
+			chunk, &chunk_name, &overridden_name);
 	if (status != LTTNG_TRACE_CHUNK_STATUS_OK &&
 			status != LTTNG_TRACE_CHUNK_STATUS_NONE) {
 		ret = -1;
 		goto end;
 	}
 
-	chunk_name_length = overriden_name ? (strlen(chunk_name) + 1) : 0;
+	chunk_name_length = overridden_name ? (strlen(chunk_name) + 1) : 0;
 	msg = (typeof(msg)){
 		.chunk_id = htobe64(chunk_id),
 		.creation_timestamp = htobe64((uint64_t) creation_timestamp),
@@ -1312,6 +1352,11 @@ int relayd_close_trace_chunk(struct lttcomm_relayd_sock *sock,
 	time_t close_timestamp;
 	LTTNG_OPTIONAL(enum lttng_trace_chunk_command_type) close_command = {};
 
+	if (!relayd_supports_chunks(sock)) {
+		DBG("Refusing to close remote trace chunk: relayd does not support chunks");
+		goto end;
+	}
+
 	status = lttng_trace_chunk_get_id(chunk, &chunk_id);
 	if (status != LTTNG_TRACE_CHUNK_STATUS_OK) {
 		ERR("Failed to get trace chunk id");
@@ -1383,6 +1428,11 @@ int relayd_trace_chunk_exists(struct lttcomm_relayd_sock *sock,
 	struct lttcomm_relayd_trace_chunk_exists msg = {};
 	struct lttcomm_relayd_trace_chunk_exists_reply reply = {};
 
+	if (!relayd_supports_chunks(sock)) {
+		DBG("Refusing to check for trace chunk existence: relayd does not support chunks");
+		goto end;
+	}
+
 	msg = (typeof(msg)){
 			.chunk_id = htobe64(chunk_id),
 	};