X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=35e4e3bceed8913f9b17b6b745ebd149058c84e5;hb=690732c05af4afe24d01a7c8509b7baf321dc221;hp=6c150540042021f1b2f6a90d1802b24e25a71ac7;hpb=52bbdc377b5fdadda1ed83aa95438ec4e63f83a1;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 6c1505400..35e4e3bce 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2488,7 +2488,7 @@ static int do_consumer_create_channel(struct ltt_ust_session *usess,
 	health_code_update();
 
 	/*
-	 * Now get the channel from the consumer. This call wil populate the stream
+	 * Now get the channel from the consumer. This call will populate the stream
 	 * list of that channel and set the ust objects.
 	 */
 	if (usess->consumer->enabled) {
@@ -6277,11 +6277,6 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 			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);
@@ -6304,6 +6299,19 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 				}
 			}
 
+			/*
+			 * The metadata channel might not be present.
+			 *
+			 * Consumer stream allocation can be done
+			 * asynchronously and can fail on intermediary
+			 * operations (i.e add context) and lead to data
+			 * channels created with no metadata channel.
+			 */
+			if (!reg->registry->reg.ust->metadata_key) {
+				/* Skip since no metadata is present. */
+				continue;
+			}
+
 			(void) push_metadata(reg->registry->reg.ust, usess->consumer);
 
 			ret = consumer_rotate_channel(socket,