From: Jonathan Rajotte Date: Fri, 8 Feb 2019 01:25:42 +0000 (-0500) Subject: Fix: don't destroy the sockets if the snapshot was successful X-Git-Tag: v2.11.0-rc2~71 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=31e66c40640137098eaa6019374e4cd65daf5efc;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. 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 --- diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index d3c8376be..d91869fae 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -4179,10 +4179,13 @@ static enum lttng_error_code record_ust_snapshot(struct ltt_ust_session *usess, goto error_snapshot; } + 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 status; }