Fix: don't destroy the sockets if the snapshot was successful
authorJonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Fri, 8 Feb 2019 01:25:42 +0000 (20:25 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 11 Feb 2019 22:52:04 +0000 (17:52 -0500)
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 <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng-sessiond/cmd.c

index 91040ec1ede9b83043815d4ca468b256b2ae3468..16f4849bc7c7a4b888ee0e788c42c7443b8a0bda 100644 (file)
@@ -3846,11 +3846,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;
 }
 
This page took 0.028354 seconds and 4 git commands to generate.