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-Url: http://git.efficios.com/?p=lttng-tools.git;a=commitdiff_plain;h=1371fc1228461eb532118280e67ab3e9de015757;hp=24eb8569dc841f318d7964ca9a0ad0a4f9508a8e

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 11ff9b489..58506b2b2 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2979,11 +2979,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;
 }