Skip to contentSkip to conversation

Fix: metadata push -EPIPE should be recoverable

RFC PATCH Aravind HT 3 participants 3 messages Jul 6, 2015 – Jul 10, 2015 2 messages 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]

Aravind HT

author
#1 lore raw

In case of -EPIPE, im thinking if we can send LTTNG_ERR_UND or some other error back to the consumer for it to do any relevant clean up.

Quoted 75 lines · Mathieu Desnoyers

This return value can be caused by application terminating concurrently (when using per-PID buffers), so it should not make the consumer management thread exit.

---
 src/bin/lttng-sessiond/ust-app.c      | 13 ++++++++++---
 src/bin/lttng-sessiond/ust-consumer.c |  7 +++++--
 2 files changed, 15 insertions(+), 5 deletions(-)
src/bin/lttng-sessiond/ust-app.c +3 -0
index c30792c..6f032da 100644
@@ -431,6 +431,9 @@ void delete_ust_app_channel(int sock, struct
 ust_app_channel *ua_chan,
  * Must be called with the registry lock held.
  *
  * On success, return the len of metadata pushed or else a negative value.
+ * Returning a -EPIPE return value means we could not send the metadata,
+ * but it can be caused by recoverable errors (e.g. the application has
+ * terminated concurrently).
  */
 ssize_t ust_app_push_metadata(struct ust_registry_session *registry,

struct consumer_socket *socket, int send_zero_data)

src/bin/lttng-sessiond/ust-app.c +4 -3
@@ -454,9 +457,10 @@ ssize_t ust_app_push_metadata(struct
 ust_registry_session *registry,
        /*
         * On a push metadata error either the consumer is dead or the
         * metadata channel has been destroyed because its endpoint
-        * might have died (e.g: relayd). If so, the metadata closed
-        * flag is set to 1 so we deny pushing metadata again which is
-        * not valid anymore on the consumer side.
+        * might have died (e.g: relayd), or because the application has
+        * exited. If so, the metadata closed flag is set to 1 so we
+        * deny pushing metadata again which is not valid anymore on the
+        * consumer side.
         */
        if (registry->metadata_closed) {
                return -EPIPE;
src/bin/lttng-sessiond/ust-app.c +3 -0
@@ -547,6 +551,9 @@ error_push:
  * of socket throughout this function.
  *
  * Return 0 on success else a negative error.
+ * Returning a -EPIPE return value means we could not send the metadata,
+ * but it can be caused by recoverable errors (e.g. the application has
+ * terminated concurrently).
  */
 static int push_metadata(struct ust_registry_session *registry,
                struct consumer_output *consumer)
src/bin/lttng-sessiond/ust-consumer.c +5 -2
index 78e50df..ad076e3 100644
@@ -511,12 +511,15 @@ int ust_consumer_metadata_request(struct
 consumer_socket *socket)
        pthread_mutex_lock(&ust_reg->lock);
        ret_push = ust_app_push_metadata(ust_reg, socket, 1);
        pthread_mutex_unlock(&ust_reg->lock);
-       if (ret_push < 0) {
+       if (ret_push == -EPIPE) {
+               DBG("Application or relay closed while pushing metadata");
+       } else if (ret_push < 0) {
                ERR("Pushing metadata");
                ret = -1;
                goto end;
+       } else {
+               DBG("UST Consumer metadata pushed successfully");
        }
-       DBG("UST Consumer metadata pushed successfully");
        ret = 0;
 
Quoted 5 lines

end:
--
2.1.4

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

A message that is not in the archive (sent off-list or not yet received): CACd+_b5JdeMZ58PPLAK=8+4BWqy4-XPZ3DenbJ9CqcRk-XWOLg@mail.gmail.com

#3 lore raw

We should not have to send any error back to the consumer because the app disappearing will eventually close all file descriptors related to the communication and notification pipes (sessiond vs apps), as well as all stream file descriptors (consumerd vs apps). So the consumerd will eventually be notified that the application disappeared, and will therefore close the associated streams (in per-pid buffers) in due time.

Thanks,

Mathieu

Quoted 83 lines · Aravind

In case of -EPIPE, im thinking if we can send LTTNG_ERR_UND or some other error back to the consumer for it to do any relevant clean up.

Quoted 77 lines · Mathieu Desnoyers

This return value can be caused by application terminating concurrently (when using per-PID buffers), so it should not make the consumer management thread exit.

---
src/bin/lttng-sessiond/ust-app.c | 13 ++++++++++--- src/bin/lttng-sessiond/ust-consumer.c | 7 +++++--

2 files changed, 15 insertions(+), 5 deletions(-)
src/bin/lttng-sessiond/ust-app.c +3 -0
index c30792c..6f032da 100644
@@ -431,6 +431,9 @@ void delete_ust_app_channel(int sock, struct ust_app_channel
 *ua_chan,
 * Must be called with the registry lock held.
 *
 * On success, return the len of metadata pushed or else a negative value.
+ * Returning a -EPIPE return value means we could not send the metadata,
+ * but it can be caused by recoverable errors (e.g. the application has
+ * terminated concurrently).
 */
 ssize_t ust_app_push_metadata(struct ust_registry_session *registry,

struct consumer_socket *socket, int send_zero_data)

src/bin/lttng-sessiond/ust-app.c +4 -3
@@ -454,9 +457,10 @@ ssize_t ust_app_push_metadata(struct ust_registry_session
 *registry,
 /*
 * On a push metadata error either the consumer is dead or the
 * metadata channel has been destroyed because its endpoint
- * might have died (e.g: relayd). If so, the metadata closed
- * flag is set to 1 so we deny pushing metadata again which is
- * not valid anymore on the consumer side.
+ * might have died (e.g: relayd), or because the application has
+ * exited. If so, the metadata closed flag is set to 1 so we
+ * deny pushing metadata again which is not valid anymore on the
+ * consumer side.
 */
 if (registry->metadata_closed) {

return -EPIPE;

src/bin/lttng-sessiond/ust-app.c +3 -0
@@ -547,6 +551,9 @@ error_push:
 * of socket throughout this function.
 *
 * Return 0 on success else a negative error.
+ * Returning a -EPIPE return value means we could not send the metadata,
+ * but it can be caused by recoverable errors (e.g. the application has
+ * terminated concurrently).
 */
 static int push_metadata(struct ust_registry_session *registry,
 struct consumer_output *consumer)
src/bin/lttng-sessiond/ust-consumer.c +5 -2
index 78e50df..ad076e3 100644
@@ -511,12 +511,15 @@ int ust_consumer_metadata_request(struct consumer_socket
 *socket)
 pthread_mutex_lock(&ust_reg->lock);
 ret_push = ust_app_push_metadata(ust_reg, socket, 1);
 pthread_mutex_unlock(&ust_reg->lock);
- if (ret_push < 0) {
+ if (ret_push == -EPIPE) {
+ DBG("Application or relay closed while pushing metadata");
+ } else if (ret_push < 0) {
 ERR("Pushing metadata");
 ret = -1;
 goto end;
+ } else {
+ DBG("UST Consumer metadata pushed successfully");
 }
- DBG("UST Consumer metadata pushed successfully");
 ret = 0;
 

end:
--
2.1.4

Signature · 3 lines
Mathieu Desnoyers 
EfficiOS Inc. 
http://www.efficios.com 

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

#4 lore raw
In reply to a message not in the archive

Merged in master, stable-2.6 and stable-2.5. Thanks!

Jérémie

Quoted 80 lines · Mathieu Desnoyers

This return value can be caused by application terminating concurrently (when using per-PID buffers), so it should not make the consumer management thread exit.

---
 src/bin/lttng-sessiond/ust-app.c      | 13 ++++++++++---
 src/bin/lttng-sessiond/ust-consumer.c |  7 +++++--
 2 files changed, 15 insertions(+), 5 deletions(-)
src/bin/lttng-sessiond/ust-app.c +3 -0
index c30792c..6f032da 100644
@@ -431,6 +431,9 @@ void delete_ust_app_channel(int sock, struct
 ust_app_channel *ua_chan,
  * Must be called with the registry lock held.
  *
  * On success, return the len of metadata pushed or else a negative value.
+ * Returning a -EPIPE return value means we could not send the metadata,
+ * but it can be caused by recoverable errors (e.g. the application has
+ * terminated concurrently).
  */
 ssize_t ust_app_push_metadata(struct ust_registry_session *registry,

struct consumer_socket *socket, int send_zero_data)

src/bin/lttng-sessiond/ust-app.c +4 -3
@@ -454,9 +457,10 @@ ssize_t ust_app_push_metadata(struct
 ust_registry_session *registry,
        /*
         * On a push metadata error either the consumer is dead or the
         * metadata channel has been destroyed because its endpoint
-        * might have died (e.g: relayd). If so, the metadata closed
-        * flag is set to 1 so we deny pushing metadata again which is
-        * not valid anymore on the consumer side.
+        * might have died (e.g: relayd), or because the application has
+        * exited. If so, the metadata closed flag is set to 1 so we
+        * deny pushing metadata again which is not valid anymore on the
+        * consumer side.
         */
        if (registry->metadata_closed) {
                return -EPIPE;
src/bin/lttng-sessiond/ust-app.c +3 -0
@@ -547,6 +551,9 @@ error_push:
  * of socket throughout this function.
  *
  * Return 0 on success else a negative error.
+ * Returning a -EPIPE return value means we could not send the metadata,
+ * but it can be caused by recoverable errors (e.g. the application has
+ * terminated concurrently).
  */
 static int push_metadata(struct ust_registry_session *registry,
                struct consumer_output *consumer)
src/bin/lttng-sessiond/ust-consumer.c +5 -2
index 78e50df..ad076e3 100644
@@ -511,12 +511,15 @@ int ust_consumer_metadata_request(struct
 consumer_socket *socket)
        pthread_mutex_lock(&ust_reg->lock);
        ret_push = ust_app_push_metadata(ust_reg, socket, 1);
        pthread_mutex_unlock(&ust_reg->lock);
-       if (ret_push < 0) {
+       if (ret_push == -EPIPE) {
+               DBG("Application or relay closed while pushing metadata");
+       } else if (ret_push < 0) {
                ERR("Pushing metadata");
                ret = -1;
                goto end;
+       } else {
+               DBG("UST Consumer metadata pushed successfully");
        }
-       DBG("UST Consumer metadata pushed successfully");
        ret = 0;
 

end:
--
2.1.4

Signature · 3 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