X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=b5a98432fb53468c6f1b1cc1dbb5e61918bddf95;hp=2f0a39fede12d5e130d9fc8f88f011dd2f80dc96;hb=09a90bcd757486eebb38d6d6023c603d9af72b4e;hpb=88a5db7000bfa9a29be7e843e580aae64e9e7b95

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 2f0a39fed..b5a98432f 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1926,6 +1926,15 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 	switch (domain) {
 	case LTTNG_DOMAIN_KERNEL:
 		DBG3("Copying tracing session consumer output in kernel session");
+		/*
+		 * XXX: We should audit the session creation and what this function
+		 * does "extra" in order to avoid a destroy since this function is used
+		 * in the domain session creation (kernel and ust) only. Same for UST
+		 * domain.
+		 */
+		if (session->kernel_session->consumer) {
+			consumer_destroy_output(session->kernel_session->consumer);
+		}
 		session->kernel_session->consumer =
 			consumer_copy_output(session->consumer);
 		/* Ease our life a bit for the next part */
@@ -1934,6 +1943,9 @@ static int copy_session_consumer(int domain, struct ltt_session *session)
 		break;
 	case LTTNG_DOMAIN_UST:
 		DBG3("Copying tracing session consumer output in UST session");
+		if (session->ust_session->consumer) {
+			consumer_destroy_output(session->ust_session->consumer);
+		}
 		session->ust_session->consumer =
 			consumer_copy_output(session->consumer);
 		/* Ease our life a bit for the next part */