Merged in master, stable-2.11, stable-2.10, and stable-2.9.

Thanks,
Jérémie

On Mon, Sep 10, 2018 at 08:09:13PM -0400, Jonathan Rajotte wrote:
> A value of zero for the metadata key indicate that metadata was never
> created/pushed to the consumer.
> 
> This can occur in scenario were a tracker is present since metadata
> might never be created/pushed.
> 
> Signed-off-by: Jonathan Rajotte <jonathan.rajotte-jul...@efficios.com>
> ---
>  src/bin/lttng-sessiond/ust-app.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/src/bin/lttng-sessiond/ust-app.c 
> b/src/bin/lttng-sessiond/ust-app.c
> index 5cf904939..52d1da787 100644
> --- a/src/bin/lttng-sessiond/ust-app.c
> +++ b/src/bin/lttng-sessiond/ust-app.c
> @@ -5975,6 +5975,11 @@ int ust_app_snapshot_record(struct ltt_ust_session 
> *usess,
>                       struct buffer_reg_channel *reg_chan;
>                       struct consumer_socket *socket;
>  
> +                     if (!reg->registry->reg.ust->metadata_key) {
> +                             /* Skip since no metadata is present */
> +                             continue;
> +                     }
> +
>                       /* Get consumer socket to use to push the metadata.*/
>                       socket = 
> consumer_find_socket_by_bitness(reg->bits_per_long,
>                                       usess->consumer);
> -- 
> 2.17.1
> 
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev

Reply via email to