X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=f4e4bedb594e89946907dc56b151f72fd4fa6665;hp=1f2d4238ef673825312e29b19f397c49ef482a9d;hb=ef67c0723053abd24b25186597388d84f76b6727;hpb=ff588497b3dfc3138c9ce005e9270ed5568c05df

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 1f2d4238e..f4e4bedb5 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -7,7 +7,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <errno.h>
 #include <inttypes.h>
 #include <pthread.h>
 #include <stdio.h>
@@ -19,6 +18,7 @@
 #include <urcu/compiler.h>
 #include <signal.h>
 
+#include <common/compat/errno.h>
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
 
@@ -4359,15 +4359,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:
@@ -5035,6 +5026,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;
@@ -5078,6 +5070,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: