X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=dedf4e600d50b0b3bc98d780d9f28aac8a634eb9;hb=d02e041f27640bee1badaddc6c3ea75a72741d3c;hp=41f201c48bb4ef8ea31b8c318c1ae95f2c4b434a;hpb=962971d24e31ba0a82094e1786a2bfce124cc29f;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 41f201c48..dedf4e600 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -4430,15 +4430,6 @@ int ust_app_start_trace(struct ltt_ust_session *usess, struct ust_app *app)
 		goto skip_setup;
 	}
 
-	/*
-	 * Create the metadata for the application. This returns gracefully if a
-	 * metadata was already set for the session.
-	 */
-	ret = create_ust_app_metadata(ua_sess, app, usess->consumer);
-	if (ret < 0) {
-		goto error_unlock;
-	}
-
 	health_code_update();
 
 skip_setup:
@@ -5104,6 +5095,7 @@ void ust_app_synchronize(struct ltt_ust_session *usess,
 	}
 
 	rcu_read_lock();
+
 	cds_lfht_for_each_entry(usess->domain_global.channels->ht, &uchan_iter,
 			uchan, node.node) {
 		struct ust_app_channel *ua_chan;
@@ -5147,6 +5139,21 @@ void ust_app_synchronize(struct ltt_ust_session *usess,
 			}
 		}
 	}
+
+	/*
+	 * Create the metadata for the application. This returns gracefully if a
+	 * metadata was already set for the session.
+	 *
+	 * The metadata channel must be created after the data channels as the
+	 * consumer daemon assumes this ordering. When interacting with a relay
+	 * daemon, the consumer will use this assumption to send the
+	 * "STREAMS_SENT" message to the relay daemon.
+	 */
+	ret = create_ust_app_metadata(ua_sess, app, usess->consumer);
+	if (ret < 0) {
+		goto error_unlock;
+	}
+
 	rcu_read_unlock();
 
 end: