Re: [LTTNG-TOOLS PATCH] Fix: don't destroy the sockets if the snapshot was successful

Re: [LTTNG-TOOLS PATCH] Fix: don't destroy the sockets if the snapshot was successful

[Jérémie Galarneau]

Merged all the way to 2.4.

Thanks!
Jérémie

On Tue, Dec 9, 2014 at 4:38 PM, Julien Desfossez
<jdesfossez@efficios.com> wrote:
> 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>
> ---
>  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 11ff9b4..58506b2 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;
>  }
>
> --
> 1.9.1
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

[LTTNG-TOOLS PATCH] Fix: don't destroy the sockets if the snapshot was successful

[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.

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
---
 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 11ff9b4..58506b2 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;
 }
 
-- 
1.9.1