From 5748df44d1f75f9baf5e524e2f13367ce09b83ea Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 7 Feb 2019 20:25:42 -0500 Subject: [PATCH] Fix: don't destroy the sockets if the snapshot was successful MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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. This is verbatim from the fix 1371fc1228461eb532118280e67ab3e9de015757 It is also the same fix. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- src/bin/lttng-sessiond/cmd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index cf30b8ebf..97ed8985b 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -3755,11 +3755,13 @@ static int record_ust_snapshot(struct ltt_ust_session *usess, } 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; } -- 2.34.1