Fix: Bad error handling when enable channel fails

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

diff --git a/src/bin/lttng-sessiond/channel.c b/src/bin/lttng-sessiond/channel.c
index ae53c672c6c2a5792ba981324f37097e7f596f6d..559c3d154034193381357540e0c0bc7a01f30ce0 100644 (file)
--- a/src/bin/lttng-sessiond/channel.c
+++ b/src/bin/lttng-sessiond/channel.c
@@ -190,8 +190,16 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain,
        switch (domain) {
        case LTTNG_DOMAIN_UST:
                DBG2("Channel %s being enabled in UST global domain", uchan->name);
-               /* Enable channel for global domain */
-               ret = ust_app_enable_channel_glb(usess, uchan);
+
+               /*
+                * Enable channel for UST global domain on all applications. Ignore
+                * return value here since whatever error we got, it means that the
+                * channel was not created on one or many registered applications and
+                * we can not report this to the user yet. However, at this stage, the
+                * channel was successfully created on the session daemon side so the
+                * enable-channel command is a success.
+                */
+               (void) ust_app_create_channel_glb(usess, uchan);
                break;
 #if 0
        case LTTNG_DOMAIN_UST_PID:
@@ -203,15 +211,6 @@ int channel_ust_enable(struct ltt_ust_session *usess, int domain,
                goto error;
        }
 
-       if (ret < 0) {
-               if (ret != -LTTNG_UST_ERR_EXIST) {
-                       ret = LTTNG_ERR_UST_CHAN_ENABLE_FAIL;
-                       goto error;
-               } else {
-                       ret = LTTNG_OK;
-               }
-       }
-
        uchan->enabled = 1;
        DBG2("Channel %s enabled successfully", uchan->name);