Fix: only synchronize application configuration on tracing start

[lttng-tools.git] / src / bin / lttng-sessiond / context.c

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 6cf301dcd04488b1a9f02ce79584e5cf0c445dea..3861d22c1e3b7cf28275badf86fb388fddfd2bd0 100644 (file)
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -169,18 +169,19 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess,
                goto error;
        }
 
-       ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
-       if (ret < 0) {
-               goto error;
-       }
-
-       rcu_read_lock();
-
        /* Add ltt UST context node to ltt UST channel */
        lttng_ht_add_ulong(uchan->ctx, &uctx->node);
-       rcu_read_unlock();
        cds_list_add_tail(&uctx->list, &uchan->ctx_list);
 
+       if (!usess->active) {
+               goto end;
+       }
+
+       ret = ust_app_add_ctx_channel_glb(usess, uchan, uctx);
+       if (ret < 0) {
+               goto error;
+       }
+end:
        DBG("Context UST %d added to channel %s", uctx->ctx.ctx, uchan->name);
 
        return 0;