X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=f6c44d3be16e63096e856874344dd39e11b4d348;hb=b5893d8e91f64257e58a50c7f5b413a5b31cf076;hp=3bb3aced586edbb2f07da3c117ae5428942a2356;hpb=348a81dcf7b6944b10a813d93dcaf86fdb5194f6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 3bb3aced5..f6c44d3be 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2579,7 +2579,8 @@ int cmd_start_trace(struct ltt_session *session)
 		goto error;
 	}
 
-	if (session->output_traces && !session->current_trace_chunk) {
+	if (session->output_traces && !session->current_trace_chunk &&
+			session_output_supports_trace_chunks(session)) {
 		struct lttng_trace_chunk *trace_chunk;
 
 		trace_chunk = session_create_new_trace_chunk(
@@ -3170,7 +3171,11 @@ int cmd_destroy_session(struct ltt_session *session,
 
 	if (session->most_recent_chunk_id.is_set &&
 			session->most_recent_chunk_id.value != 0 &&
-			session->current_trace_chunk) {
+			session->current_trace_chunk && session->output_traces) {
+		/*
+		 * Perform a last rotation on destruction if rotations have
+		 * occurred during the session's lifetime.
+		 */
 		ret = cmd_rotate_session(session, NULL);
 		if (ret != LTTNG_OK) {
 			ERR("Failed to perform an implicit rotation as part of the destruction of session \"%s\": %s",