X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=71c0789b3421c5ff4ef9bfc0fa8de354b9104f61;hp=a17cc678ecab2363a95166b82f1c794a15c8ff96;hb=3156892b9633c1fbee3ace6cc2b013e678343083;hpb=d186e4cbbca201936132f3b6aad1710e35dec373

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index a17cc678e..71c0789b3 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -4788,6 +4788,8 @@ int cmd_rotate_session(struct ltt_session *session,
 	struct lttng_trace_chunk *chunk_being_archived = NULL;
 	struct lttng_trace_chunk *new_trace_chunk = NULL;
 	enum lttng_trace_chunk_status chunk_status;
+	bool failed_to_rotate = false;
+	enum lttng_error_code rotation_fail_code = LTTNG_OK;
 
 	assert(session);
 
@@ -4845,7 +4847,13 @@ int cmd_rotate_session(struct ltt_session *session,
 		}
         }
 
-        /* The current trace chunk becomes the chunk being archived. */
+	/*
+	 * The current trace chunk becomes the chunk being archived.
+	 *
+	 * After this point, "chunk_being_archived" must absolutely
+	 * be closed on the consumer(s), otherwise it will never be
+	 * cleaned-up, which will result in a leak.
+	 */
 	ret = session_set_trace_chunk(session, new_trace_chunk,
 			&chunk_being_archived);
 	if (ret) {
@@ -4861,13 +4869,15 @@ int cmd_rotate_session(struct ltt_session *session,
 	if (session->kernel_session) {
 		cmd_ret = kernel_rotate_session(session);
 		if (cmd_ret != LTTNG_OK) {
-			goto error;
+			failed_to_rotate = true;
+			rotation_fail_code = cmd_ret;
 		}
 	}
 	if (session->ust_session) {
 		cmd_ret = ust_app_rotate_session(session);
 		if (cmd_ret != LTTNG_OK) {
-			goto error;
+			failed_to_rotate = true;
+			rotation_fail_code = cmd_ret;
 		}
 	}
 
@@ -4882,6 +4892,11 @@ int cmd_rotate_session(struct ltt_session *session,
 		goto error;
 	}
 
+	if (failed_to_rotate) {
+		cmd_ret = rotation_fail_code;
+		goto error;
+	}
+
 	session->quiet_rotation = quiet_rotation;
 	ret = timer_session_rotation_pending_check_start(session,
 			DEFAULT_ROTATE_PENDING_TIMER);