From: Mathieu Desnoyers Date: Wed, 19 Aug 2015 21:44:59 +0000 (-0700) Subject: Fix: sessiond vs consumerd push/get metadata deadlock X-Git-Tag: v2.6.1~47 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=07559847d905fcf2a566ca1202c436eb72f4cc3f;p=lttng-tools.git Fix: sessiond vs consumerd push/get metadata deadlock We need to unlock the registry while we push metadata to break a circular dependency between the consumerd metadata lock and the sessiond registry lock. Indeed, pushing metadata to the consumerd awaits that it gets pushed all the way to relayd, but doing so requires grabbing the metadata lock. If a concurrent metadata request is being performed by consumerd, this can try to grab the registry lock on the sessiond while holding the metadata lock on the consumer daemon. Those push and pull schemes are performed on two different bidirectionnal communication sockets. Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- diff --git a/src/common/consumer-timer.h b/src/common/consumer-timer.h index f877b8ffe..a9360027e 100644 --- a/src/common/consumer-timer.h +++ b/src/common/consumer-timer.h @@ -55,4 +55,7 @@ void consumer_signal_init(void); int consumer_flush_kernel_index(struct lttng_consumer_stream *stream); int consumer_flush_ust_index(struct lttng_consumer_stream *stream); +int consumer_flush_kernel_index(struct lttng_consumer_stream *stream); +int consumer_flush_ust_index(struct lttng_consumer_stream *stream); + #endif /* CONSUMER_TIMER_H */