From: Julien Desfossez <jdesfossez@efficios.com>
Date: Tue, 9 Dec 2014 21:38:05 +0000 (-0500)
Subject: Fix: don't destroy the sockets if the snapshot was successful
X-Git-Tag: v2.6.0-rc4~1
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=fa7fee60cac8659b3a980a6400939a5a24e0e61e;p=lttng-tools.git

Fix: don't destroy the sockets if the snapshot was successful

Missing a goto to skip the error condition that was destroying the
relayd sockets even if a snapshot was successful. We want to keep them
open to reuse them for the next snapshots.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index dbecc3d24..e23717263 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2961,11 +2961,13 @@ static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
 	}
 
 	ret = LTTNG_OK;
+	goto end;
 
 error_snapshot:
 	/* Clean up copied sockets so this output can use some other later on. */
 	consumer_destroy_output_sockets(output->consumer);
 error:
+end:
 	return ret;
 }