X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=73c6d6a0fbab4387668d4aad18f77b964d7c69c3;hb=ffa3f2455c34da70fa040a3170e748889802cbf0;hp=41a321f0a3a8dc5a10d1c7d15eca79bca621241c;hpb=2e84128e5c7b7a40ede7276c8ada56a56631c5dc;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 41a321f0a..73c6d6a0f 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -481,6 +481,25 @@ push_data:
 	ret = consumer_push_metadata(socket, registry->metadata_key,
 			metadata_str, len, offset);
 	if (ret < 0) {
+		/*
+		 * There is an acceptable race here between the registry metadata key
+		 * assignment and the creation on the consumer. The session daemon can
+		 * concurrently push metadata for this registry while being created on
+		 * the consumer since the metadata key of the registry is assigned
+		 * *before* it is setup to avoid the consumer to ask for metadata that
+		 * could possibly be not found in the session daemon.
+		 *
+		 * The metadata will get pushed either by the session being stopped or
+		 * the consumer requesting metadata if that race is triggered.
+		 */
+		if (ret == -LTTCOMM_CONSUMERD_CHANNEL_FAIL) {
+			ret = 0;
+		}
+
+		/* Update back the actual metadata len sent since it failed here. */
+		pthread_mutex_lock(&registry->lock);
+		registry->metadata_len_sent -= len;
+		pthread_mutex_unlock(&registry->lock);
 		ret_val = ret;
 		goto error_push;
 	}