X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotate.c;h=4264cd4bd91fadeca704f9895b4c0733610a1b9c;hb=fc58be13f62e691645dd75d56ce26d2e121b13e0;hp=05e9bb08a48ca397710beb720c78ea5e59891df4;hpb=db66e57489e5014289dc1d831e1eac90ac4fc0da;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotate.c b/src/bin/lttng-sessiond/rotate.c
index 05e9bb08a..4264cd4bd 100644
--- a/src/bin/lttng-sessiond/rotate.c
+++ b/src/bin/lttng-sessiond/rotate.c
@@ -32,6 +32,8 @@
 #include <signal.h>
 #include <inttypes.h>
 
+#include <lttng/rotate-internal.h>
+
 #include "session.h"
 #include "rotate.h"
 #include "rotation-thread.h"
@@ -50,6 +52,38 @@ unsigned long hash_channel_key(struct rotation_channel_key *key)
 			(void *) (unsigned long) key->domain, lttng_ht_seed);
 }
 
+int rotate_add_channel_pending(uint64_t key, enum lttng_domain_type domain,
+		struct ltt_session *session)
+{
+	int ret;
+	struct rotation_channel_info *new_info;
+	struct rotation_channel_key channel_key = { .key = key,
+		.domain = domain };
+
+	new_info = zmalloc(sizeof(struct rotation_channel_info));
+	if (!new_info) {
+		goto error;
+	}
+
+	new_info->channel_key.key = key;
+	new_info->channel_key.domain = domain;
+	new_info->session_id = session->id;
+	cds_lfht_node_init(&new_info->rotate_channels_ht_node);
+
+	session->nr_chan_rotate_pending++;
+	cds_lfht_add(channel_pending_rotate_ht,
+			hash_channel_key(&channel_key),
+			&new_info->rotate_channels_ht_node);
+
+	ret = 0;
+	goto end;
+
+error:
+	ret = -1;
+end:
+	return ret;
+}
+
 /* The session's lock must be held by the caller. */
 static
 int session_rename_chunk(struct ltt_session *session, char *current_path,
@@ -175,8 +209,8 @@ error:
 int rename_complete_chunk(struct ltt_session *session, time_t ts)
 {
 	struct tm *timeinfo;
-	char datetime[16], start_datetime[16];
 	char new_path[LTTNG_PATH_MAX];
+	char datetime[21], start_datetime[21];
 	int ret;
 	size_t strf_ret;
 
@@ -187,7 +221,8 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 		ret = -1;
 		goto end;
 	}
-	strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S",
+
+	strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%dT%H%M%S%z",
 			timeinfo);
 	if (strf_ret == 0) {
 		ERR("Failed to format timestamp while renaming completed session chunk");
@@ -196,7 +231,7 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 	}
 
 	if (session->rotate_count == 1) {
-		char start_time[16];
+		char start_time[21];
 
 		timeinfo = localtime(&session->last_chunk_start_ts);
 		if (!timeinfo) {
@@ -206,7 +241,7 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 		}
 
 		strf_ret = strftime(start_time, sizeof(start_time),
-				"%Y%m%d-%H%M%S", timeinfo);
+				"%Y%m%dT%H%M%S%z", timeinfo);
 		if (strf_ret == 0) {
 			ERR("Failed to format timestamp while renaming completed session chunk");
 			ret = -1;
@@ -268,7 +303,8 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 			ret = -1;
 			goto end;
 		}
-		strf_ret = strftime(start_datetime, sizeof(start_datetime), "%Y%m%d-%H%M%S", timeinfo);
+		strf_ret = strftime(start_datetime, sizeof(start_datetime),
+				"%Y%m%dT%H%M%S%z", timeinfo);
 		if (!strf_ret) {
 			ERR("Failed to format timestamp while renaming completed session chunk");
 			ret = -1;
@@ -314,7 +350,54 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
 	goto end;
 
 error:
-	session->rotation_status = LTTNG_ROTATION_STATUS_ERROR;
+	session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+end:
+	return ret;
+}
+
+int relay_rotate_pending(struct ltt_session *session, uint64_t chunk_id)
+{
+	int ret;
+	struct consumer_socket *socket;
+	struct consumer_output *output;
+	struct lttng_ht_iter iter;
+
+	/*
+	 * Either one of the sessions is enough to find the consumer_output
+	 * and uid/gid.
+	 */
+	if (session->kernel_session) {
+		output = session->kernel_session->consumer;
+	} else if (session->ust_session) {
+		output = session->ust_session->consumer;
+	} else {
+		assert(0);
+	}
+
+	if (!output || !output->socks) {
+		ERR("No consumer output found");
+		ret = -1;
+		goto end;
+	}
+
+	ret = -1;
+
+	rcu_read_lock();
+	/*
+	 * We have to iterate to find a socket, but we only need to send the
+	 * rotate pending command to one consumer, so we break after the first
+	 * one.
+	 */
+	cds_lfht_for_each_entry(output->socks->ht, &iter.iter, socket,
+			node.node) {
+		pthread_mutex_lock(socket->lock);
+		ret = consumer_rotate_pending_relay(socket, output, session->id,
+				chunk_id);
+		pthread_mutex_unlock(socket->lock);
+		break;
+	}
+	rcu_read_unlock();
+
 end:
 	return ret;
 }