X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fconsumer.c;h=44dc35d6b92e3fafd412e35fb95b838f986bb016;hb=4c3f302be806a1c0d0a9049a04c81a7492dab4f7;hp=35d1b8aa2d9b5aaa31d217f790ec1655fa1520c0;hpb=62c43103c60bd704cd8ed7acaaa22465802f5673;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 35d1b8aa2..44dc35d6b 100644
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -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. */
@@ -1613,6 +1632,72 @@ end:
 	return ret;
 }
 
+/*
+ * Ask the consumer to rotate a channel.
+ * domain_path contains "/kernel" for kernel or the complete path for UST
+ * (ex: /ust/uid/1000/64-bit);
+ *
+ * The new_chunk_id is the session->rotate_count that has been incremented
+ * when the rotation started. On the relay, this allows to keep track in which
+ * chunk each stream is currently writing to (for the rotate_pending operation).
+ */
+int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
+		uid_t uid, gid_t gid, struct consumer_output *output,
+		char *domain_path, bool is_metadata_channel,
+		uint64_t new_chunk_id,
+		bool *rotate_pending_relay)
+{
+	int ret;
+	struct lttcomm_consumer_msg msg;
+
+	assert(socket);
+
+	DBG("Consumer rotate channel key %" PRIu64, key);
+
+	pthread_mutex_lock(socket->lock);
+	memset(&msg, 0, sizeof(msg));
+	msg.cmd_type = LTTNG_CONSUMER_ROTATE_CHANNEL;
+	msg.u.rotate_channel.key = key;
+	msg.u.rotate_channel.metadata = !!is_metadata_channel;
+	msg.u.rotate_channel.new_chunk_id = new_chunk_id;
+
+	if (output->type == CONSUMER_DST_NET) {
+		msg.u.rotate_channel.relayd_id = output->net_seq_index;
+		ret = snprintf(msg.u.rotate_channel.pathname,
+				sizeof(msg.u.rotate_channel.pathname), "%s%s%s",
+				output->dst.net.base_dir,
+				output->chunk_path, domain_path);
+		if (ret < 0 || ret == sizeof(msg.u.rotate_channel.pathname)) {
+			ERR("Failed to format channel path name when asking consumer to rotate channel");
+			ret = -1;
+			goto error;
+		}
+		*rotate_pending_relay = true;
+	} else {
+		msg.u.rotate_channel.relayd_id = (uint64_t) -1ULL;
+		ret = snprintf(msg.u.rotate_channel.pathname,
+				sizeof(msg.u.rotate_channel.pathname), "%s%s%s",
+				output->dst.session_root_path,
+				output->chunk_path, domain_path);
+		if (ret < 0 || ret == sizeof(msg.u.rotate_channel.pathname)) {
+			ERR("Failed to format channel path name when asking consumer to rotate channel");
+			ret = -1;
+			goto error;
+		}
+	}
+
+	health_code_update();
+	ret = consumer_send_msg(socket, &msg);
+	if (ret < 0) {
+		goto error;
+	}
+
+error:
+	pthread_mutex_unlock(socket->lock);
+	health_code_update();
+	return ret;
+}
+
 int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
 		const struct consumer_output *output, const char *old_path,
 		const char *new_path, uid_t uid, gid_t gid)
@@ -1669,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.
  *