X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=89b946896fc2858844be1f63c77bbd55c9e7642a;hp=0edb513f89c15263b2244983dcbf22626f95c734;hb=fc6432477fe8a5d3c4494acccdbe94c5912420bb;hpb=4419b4fb187cb896a8e64bb97c5471240abca122

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 0edb513f8..89b946896 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -898,10 +898,22 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_channel_error;
 		}
 
+		if (msg.u.ask_channel.type == LTTNG_UST_CHAN_METADATA) {
+			ret = consumer_metadata_cache_allocate(channel);
+			if (ret < 0) {
+				ERR("Allocating metadata cache");
+				goto end_channel_error;
+			}
+			consumer_timer_switch_start(channel, attr.switch_timer_interval);
+			attr.switch_timer_interval = 0;
+		}
+
 		/*
 		 * Add the channel to the internal state AFTER all streams were created
 		 * and successfully sent to session daemon. This way, all streams must
 		 * be ready before this channel is visible to the threads.
+		 * If add_channel succeeds, ownership of the channel is
+		 * passed to consumer_thread_channel_poll().
 		 */
 		ret = add_channel(channel, ctx);
 		if (ret < 0) {
@@ -923,16 +935,6 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 			goto end_nosignal;
 		}
 
-		if (msg.u.ask_channel.type == LTTNG_UST_CHAN_METADATA) {
-			ret = consumer_metadata_cache_allocate(channel);
-			if (ret < 0) {
-				ERR("Allocating metadata cache");
-				goto end_channel_error;
-			}
-			consumer_timer_switch_start(channel, attr.switch_timer_interval);
-			attr.switch_timer_interval = 0;
-		}
-
 		break;
 	}
 	case LTTNG_CONSUMER_GET_CHANNEL: