Skip to contentSkip to conversation

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

PATCH Jérémie Galarneau 1 participant 1 message Dec 10, 2014 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged all the way to 2.4.

Thanks!
Jérémie

Quoted 30 lines · Julien Desfossez

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.

---
 src/bin/lttng-sessiond/cmd.c | 2 ++
 1 file changed, 2 insertions(+)
src/bin/lttng-sessiond/cmd.c +2 -1
index 11ff9b4..58506b2 100644
@@ -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;
 }
 
--

1.9.1

Signature · 8 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev