X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=1ed1d7f81991422f9666541f7c24e85ec5549bf2;hb=638e7b4ef8bf5b7f78d5c01dd3643daea8e8f084;hp=a226b57268ce008fdbabbcf34355e70f4966f775;hpb=5c408ad8ef08a226c018702aca969536f36ac4e5;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index a226b5726..1ed1d7f81 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -735,7 +735,8 @@ error:
  *
  * The consumer socket lock must be held by the caller.
  */
-int consumer_send_fds(struct consumer_socket *sock, int *fds, size_t nb_fd)
+int consumer_send_fds(struct consumer_socket *sock, const int *fds,
+		size_t nb_fd)
 {
 	int ret;
 
@@ -889,8 +890,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 /*
  * Init channel communication message structure.
  */
-void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
-		enum lttng_consumer_command cmd,
+void consumer_init_add_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 		uint64_t channel_key,
 		uint64_t session_id,
 		const char *pathname,
@@ -913,7 +913,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
 	memset(msg, 0, sizeof(struct lttcomm_consumer_msg));
 
 	/* Send channel */
-	msg->cmd_type = cmd;
+	msg->cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
 	msg->u.channel.channel_key = channel_key;
 	msg->u.channel.session_id = session_id;
 	msg->u.channel.uid = uid;
@@ -973,7 +973,7 @@ void consumer_init_streams_sent_comm_msg(struct lttcomm_consumer_msg *msg,
  */
 int consumer_send_stream(struct consumer_socket *sock,
 		struct consumer_output *dst, struct lttcomm_consumer_msg *msg,
-		int *fds, size_t nb_fd)
+		const int *fds, size_t nb_fd)
 {
 	int ret;
 
@@ -1460,6 +1460,16 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 		if (ret < 0) {
 			ret = -LTTNG_ERR_NOMEM;
 			goto error;
+		} else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
+			ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s/%s-%s-%" PRIu64 "%s\"",
+					sizeof(msg.u.snapshot_channel.pathname),
+					ret, output->consumer->dst.net.base_dir,
+					output->consumer->subdir,
+					output->name, output->datetime,
+					output->nb_snapshot,
+					session_path);
+			ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+			goto error;
 		}
 	} else {
 		ret = snprintf(msg.u.snapshot_channel.pathname,
@@ -1472,7 +1482,16 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 		if (ret < 0) {
 			ret = -LTTNG_ERR_NOMEM;
 			goto error;
+		} else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
+			ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s-%s-%" PRIu64 "%s\"",
+					sizeof(msg.u.snapshot_channel.pathname),
+					ret, output->consumer->dst.session_root_path,
+					output->name, output->datetime, output->nb_snapshot,
+					session_path);
+			ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+			goto error;
 		}
+
 		msg.u.snapshot_channel.relayd_id = (uint64_t) -1ULL;
 
 		/* Create directory. Ignore if exist. */
@@ -1735,6 +1754,51 @@ error:
 	return ret;
 }
 
+/*
+ * Ask the relay if a rotation is still pending. Must be called with the socket
+ * lock held.
+ *
+ * Return 1 if the rotation is still pending, 0 if finished, a negative value
+ * on error.
+ */
+int consumer_rotate_pending_relay(struct consumer_socket *socket,
+		struct consumer_output *output, uint64_t session_id,
+		uint64_t chunk_id)
+{
+	int ret;
+	struct lttcomm_consumer_msg msg;
+	uint32_t pending = 0;
+
+	assert(socket);
+
+	DBG("Consumer rotate pending on relay for session %" PRIu64 ", chunk id %" PRIu64,
+			session_id, chunk_id);
+	assert(output->type == CONSUMER_DST_NET);
+
+	memset(&msg, 0, sizeof(msg));
+	msg.cmd_type = LTTNG_CONSUMER_ROTATE_PENDING_RELAY;
+	msg.u.rotate_pending_relay.session_id = session_id;
+	msg.u.rotate_pending_relay.relayd_id = output->net_seq_index;
+	msg.u.rotate_pending_relay.chunk_id = chunk_id;
+
+	health_code_update();
+	ret = consumer_send_msg(socket, &msg);
+	if (ret < 0) {
+		goto error;
+	}
+
+	ret = consumer_socket_recv(socket, &pending, sizeof(pending));
+	if (ret < 0) {
+		goto error;
+	}
+
+	ret = pending;
+
+error:
+	health_code_update();
+	return ret;
+}
+
 /*
  * Ask the consumer to create a directory.
  *