X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=54cd14ee3523955d28cd6ea4685a5f305a7170a9;hb=b006f85d9d07af970f24cfa5ab077bfe599d75c9;hp=3efda83c194149bedcf68a083db077897297e4dd;hpb=412d7227e69ec845e44c49082a417f9454d9b55d;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 3efda83c1..54cd14ee3 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -2954,7 +2954,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) {
@@ -5991,20 +5991,6 @@ void ust_app_global_update_all_event_notifier_rules(void)
 	rcu_read_unlock();
 }
 
-void ust_app_update_event_notifier_error_count(struct lttng_trigger *trigger)
-{
-	uint64_t error_count = 0;
-	enum event_notifier_error_accounting_status status;
-	struct lttng_condition *condition = lttng_trigger_get_condition(trigger);
-
-	status = event_notifier_error_accounting_get_count(trigger, &error_count);
-	if (status != EVENT_NOTIFIER_ERROR_ACCOUNTING_STATUS_OK) {
-		ERR("Error getting trigger error count.");
-	}
-
-	lttng_condition_on_event_set_error_count(condition, error_count);
-}
-
 /*
  * Add context to a specific channel for global UST domain.
  */
@@ -7118,11 +7104,6 @@ enum lttng_error_code ust_app_rotate_session(struct ltt_session *session)
 			struct buffer_reg_channel *buf_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);
@@ -7145,6 +7126,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,