X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4d4d0088cf8299ed7859c5b1558d4db0aac644f9;hb=2961f09e9ea0e7a23dade01014caa40fb323d6bd;hp=0d860236e201551a8389969359e85b1caf133eaa;hpb=92816cc33a1add3c8276839bd6335e17423577dd;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 0d860236e..4d4d0088c 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -57,7 +57,7 @@
 #include "notification-thread-commands.h"
 #include "rotate.h"
 #include "rotation-thread.h"
-#include "sessiond-timer.h"
+#include "timer.h"
 #include "agent-thread.h"
 
 #include "cmd.h"
@@ -2716,48 +2716,6 @@ error:
 	return ret;
 }
 
-static
-int rename_active_chunk(struct ltt_session *session)
-{
-	int ret;
-
-	session->current_archive_id++;
-
-	/*
-	 * The currently active tracing path is now the folder we
-	 * want to rename.
-	 */
-	ret = lttng_strncpy(session->rotation_chunk.current_rotate_path,
-			session->rotation_chunk.active_tracing_path,
-			sizeof(session->rotation_chunk.current_rotate_path));
-	if (ret) {
-		ERR("Failed to copy active tracing path");
-		goto end;
-	}
-
-	ret = rename_completed_chunk(session, time(NULL));
-	if (ret < 0) {
-		ERR("Failed to rename current rotation's path");
-		goto end;
-	}
-
-	/*
-	 * We just renamed, the folder, we didn't do an actual rotation, so
-	 * the active tracing path is now the renamed folder and we have to
-	 * restore the rotate count.
-	 */
-	ret = lttng_strncpy(session->rotation_chunk.active_tracing_path,
-			session->rotation_chunk.current_rotate_path,
-			sizeof(session->rotation_chunk.active_tracing_path));
-	if (ret) {
-		ERR("Failed to rename active session chunk tracing path");
-		goto end;
-	}
-end:
-	session->current_archive_id--;
-	return ret;
-}
-
 /*
  * Command LTTNG_STOP_TRACE processed by the client thread.
  */
@@ -2782,13 +2740,6 @@ int cmd_stop_trace(struct ltt_session *session)
 		goto error;
 	}
 
-	if (session->rotation_pending_check_timer_enabled) {
-		if (timer_session_rotation_pending_check_stop(session)) {
-			ERR("Failed to stop the \"rotation pending check\" timer of session %s",
-					session->name);
-		}
-	}
-
 	if (session->rotation_schedule_timer_enabled) {
 		if (timer_session_rotation_schedule_timer_stop(
 				session)) {
@@ -2797,6 +2748,12 @@ int cmd_stop_trace(struct ltt_session *session)
 		}
 	}
 
+	/*
+	 * A rotation is still ongoing. The check timer will continue to wait
+	 * for the rotation to complete. When the rotation finally completes,
+	 * a check will be performed to rename the "active" chunk to the
+	 * expected "timestamp_begin-timestamp_end" format.
+	 */
 	if (session->current_archive_id > 0 &&
 			session->rotation_state != LTTNG_ROTATION_STATE_ONGOING) {
 		ret = rename_active_chunk(session);
@@ -4574,6 +4531,11 @@ int cmd_rotate_session(struct ltt_session *session,
 	struct tm *timeinfo;
 	char datetime[21];
 	time_t now;
+	/*
+	 * Used to roll-back timestamps in case of failure to launch the
+	 * rotation.
+	 */
+	time_t original_last_chunk_start_ts, original_current_chunk_start_ts;
 
 	assert(session);
 
@@ -4654,29 +4616,17 @@ int cmd_rotate_session(struct ltt_session *session,
 	 * archive id.
 	 */
 	session->current_archive_id++;
-	/*
-	 * A rotation has a local step even if the destination is a relay
-	 * daemon; the buffers must be consumed by the consumer daemon.
-	 */
-	session->rotation_pending_local = true;
-	session->rotation_pending_relay =
-		session_get_consumer_destination_type(session) == CONSUMER_DST_NET;
-	session->rotation_state = LTTNG_ROTATION_STATE_ONGOING;
-	ret = notification_thread_command_session_rotation_ongoing(
-			notification_thread_handle,
-			session->name, session->uid, session->gid,
-			session->current_archive_id - 1);
-	if (ret != LTTNG_OK) {
-		ERR("Failed to notify notification thread that a session rotation is ongoing for session %s",
-				session->name);
-	}
 
-	/* Create the path name for the next chunk. */
 	now = time(NULL);
 	if (now == (time_t) -1) {
 		ret = -LTTNG_ERR_ROTATION_NOT_AVAILABLE;
 		goto end;
 	}
+
+	/* Sample chunk bounds for roll-back in case of error. */
+	original_last_chunk_start_ts = session->last_chunk_start_ts;
+	original_current_chunk_start_ts = session->current_chunk_start_ts;
+
 	session->last_chunk_start_ts = session->current_chunk_start_ts;
 	session->current_chunk_start_ts = now;
 
@@ -4693,6 +4643,16 @@ int cmd_rotate_session(struct ltt_session *session,
 		ret = -LTTNG_ERR_UNK;
 		goto end;
 	}
+
+	/*
+	 * A rotation has a local step even if the destination is a relay
+	 * daemon; the buffers must be consumed by the consumer daemon.
+	 */
+	session->rotation_pending_local = true;
+	session->rotation_pending_relay =
+		session_get_consumer_destination_type(session) == CONSUMER_DST_NET;
+	session->rotation_state = LTTNG_ROTATION_STATE_ONGOING;
+
 	if (session->kernel_session) {
 		/*
 		 * The active path for the next rotation/destroy.
@@ -4706,7 +4666,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		if (ret < 0 || ret == sizeof(session->rotation_chunk.active_tracing_path)) {
 			ERR("Failed to format active kernel tracing path in rotate session command");
 			ret = -LTTNG_ERR_UNK;
-			goto end;
+			goto error;
 		}
 		/*
 		 * The sub-directory for the consumer
@@ -4719,7 +4679,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		if (ret < 0 || ret == sizeof(session->kernel_session->consumer->chunk_path)) {
 			ERR("Failed to format the kernel consumer's sub-directory in rotate session command");
 			ret = -LTTNG_ERR_UNK;
-			goto end;
+			goto error;
 		}
 		/*
 		 * Create the new chunk folder, before the rotation begins so we don't
@@ -4732,12 +4692,12 @@ int cmd_rotate_session(struct ltt_session *session,
 			ERR("Failed to create kernel session tracing path at %s",
 					session->kernel_session->consumer->chunk_path);
 			ret = -LTTNG_ERR_CREATE_DIR_FAIL;
-			goto end;
+			goto error;
 		}
 		ret = kernel_rotate_session(session);
 		if (ret != LTTNG_OK) {
 			ret = -ret;
-			goto end;
+			goto error;
 		}
 	}
 	if (session->ust_session) {
@@ -4748,7 +4708,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		if (ret < 0) {
 			ERR("Failed to format active UST tracing path in rotate session command");
 			ret = -LTTNG_ERR_UNK;
-			goto end;
+			goto error;
 		}
 		ret = snprintf(session->ust_session->consumer->chunk_path,
 				PATH_MAX, "/%s-%" PRIu64, datetime,
@@ -4756,7 +4716,7 @@ int cmd_rotate_session(struct ltt_session *session,
 		if (ret < 0) {
 			ERR("Failed to format the UST consumer's sub-directory in rotate session command");
 			ret = -LTTNG_ERR_UNK;
-			goto end;
+			goto error;
 		}
 		/*
 		 * Create the new chunk folder, before the rotation begins so we don't
@@ -4767,18 +4727,18 @@ int cmd_rotate_session(struct ltt_session *session,
 				session->ust_session->gid);
 		if (ret) {
 			ret = -LTTNG_ERR_CREATE_DIR_FAIL;
-			goto end;
+			goto error;
 		}
 		ret = ust_app_rotate_session(session);
 		if (ret != LTTNG_OK) {
-			goto end;
+			goto error;
 		}
 	}
 
 	ret = timer_session_rotation_pending_check_start(session,
 			DEFAULT_ROTATE_PENDING_TIMER);
 	if (ret) {
-		goto end;
+		goto error;
 	}
 
 	if (!session->active) {
@@ -4789,12 +4749,30 @@ int cmd_rotate_session(struct ltt_session *session,
 		rotate_return->rotation_id = session->current_archive_id;
 	}
 
+	ret = notification_thread_command_session_rotation_ongoing(
+			notification_thread_handle,
+			session->name, session->uid, session->gid,
+			session->current_archive_id - 1);
+	if (ret != LTTNG_OK) {
+		ERR("Failed to notify notification thread that a session rotation is ongoing for session %s",
+				session->name);
+	}
+
 	DBG("Cmd rotate session %s, archive_id %" PRIu64 " sent",
 			session->name, session->current_archive_id - 1);
 	ret = LTTNG_OK;
 
 end:
 	return ret;
+error:
+	session->last_chunk_start_ts = original_last_chunk_start_ts;
+	session->current_archive_id = original_current_chunk_start_ts;
+	if (session_reset_rotation_state(session,
+			LTTNG_ROTATION_STATE_NO_ROTATION)) {
+		ERR("Failed to reset rotation state of session \"%s\"",
+				session->name);
+	}
+	goto end;
 }
 
 /*