Teardown the notification thread after the sessiond clean-up

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

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index 06fa5eeb4b4e54112a95c5998b1b870b46575a37..80e3137788ebc0c26da3302988a8ead922adf121 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1418,14 +1418,15 @@ end:
 /*
  * Ask the consumer to snapshot a specific channel using the key.
  *
- * Return 0 on success or else a negative error.
+ * Returns LTTNG_OK on success or else an LTTng error code.
  */
-int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
-               struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
-               const char *session_path, int wait, uint64_t nb_packets_per_stream,
-               uint64_t trace_archive_id)
+enum lttng_error_code consumer_snapshot_channel(struct consumer_socket *socket,
+               uint64_t key, struct snapshot_output *output, int metadata,
+               uid_t uid, gid_t gid, const char *session_path, int wait,
+               uint64_t nb_packets_per_stream, uint64_t trace_archive_id)
 {
        int ret;
+       enum lttng_error_code status = LTTNG_OK;
        struct lttcomm_consumer_msg msg;
 
        assert(socket);
@@ -1453,7 +1454,7 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                                output->nb_snapshot,
                                session_path);
                if (ret < 0) {
-                       ret = -LTTNG_ERR_NOMEM;
+                       status = LTTNG_ERR_INVALID;
                        goto error;
                } else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
                        ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s/%s-%s-%" PRIu64 "%s\"",
@@ -1463,7 +1464,7 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                                        output->name, output->datetime,
                                        output->nb_snapshot,
                                        session_path);
-                       ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+                       status = LTTNG_ERR_SNAPSHOT_FAIL;
                        goto error;
                }
        } else {
@@ -1475,7 +1476,7 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                                output->nb_snapshot,
                                session_path);
                if (ret < 0) {
-                       ret = -LTTNG_ERR_NOMEM;
+                       status = LTTNG_ERR_NOMEM;
                        goto error;
                } else if (ret >= sizeof(msg.u.snapshot_channel.pathname)) {
                        ERR("Snapshot path exceeds the maximal allowed length of %zu bytes (%i bytes required) with path \"%s/%s-%s-%" PRIu64 "%s\"",
@@ -1483,7 +1484,7 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                                        ret, output->consumer->dst.session_root_path,
                                        output->name, output->datetime, output->nb_snapshot,
                                        session_path);
-                       ret = -LTTNG_ERR_SNAPSHOT_FAIL;
+                       status = LTTNG_ERR_SNAPSHOT_FAIL;
                        goto error;
                }
 
@@ -1494,7 +1495,8 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                                S_IRWXU | S_IRWXG, uid, gid);
                if (ret < 0) {
                        if (errno != EEXIST) {
-                               ERR("Trace directory creation error");
+                               status = LTTNG_ERR_CREATE_DIR_FAIL;
+                               PERROR("Trace directory creation error");
                                goto error;
                        }
                }
@@ -1505,12 +1507,20 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
        ret = consumer_send_msg(socket, &msg);
        pthread_mutex_unlock(socket->lock);
        if (ret < 0) {
+               switch (-ret) {
+               case LTTCOMM_CONSUMERD_CHAN_NOT_FOUND:
+                       status = LTTNG_ERR_CHAN_NOT_FOUND;
+                       break;
+               default:
+                       status = LTTNG_ERR_SNAPSHOT_FAIL;
+                       break;
+               }
                goto error;
        }
 
 error:
        health_code_update();
-       return ret;
+       return status;
 }
 
 /*
@@ -1663,7 +1673,7 @@ int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
                                output->chunk_path, domain_path);
                if (ret < 0 || ret == sizeof(msg.u.rotate_channel.pathname)) {
                        ERR("Failed to format channel path name when asking consumer to rotate channel");
-                       ret = -1;
+                       ret = -LTTNG_ERR_INVALID;
                        goto error;
                }
        } else {
@@ -1674,7 +1684,7 @@ int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
                                output->chunk_path, domain_path);
                if (ret < 0 || ret == sizeof(msg.u.rotate_channel.pathname)) {
                        ERR("Failed to format channel path name when asking consumer to rotate channel");
-                       ret = -1;
+                       ret = -LTTNG_ERR_INVALID;
                        goto error;
                }
        }
@@ -1682,9 +1692,16 @@ int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
        health_code_update();
        ret = consumer_send_msg(socket, &msg);
        if (ret < 0) {
+               switch (-ret) {
+               case LTTCOMM_CONSUMERD_CHAN_NOT_FOUND:
+                       ret = -LTTNG_ERR_CHAN_NOT_FOUND;
+                       break;
+               default:
+                       ret = -LTTNG_ERR_ROTATION_FAIL_CONSUMER;
+                       break;
+               }
                goto error;
        }
-
 error:
        pthread_mutex_unlock(socket->lock);
        health_code_update();
@@ -1710,7 +1727,7 @@ int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
        if (old_path_length >= sizeof(msg.u.rotate_rename.old_path)) {
                ERR("consumer_rotate_rename: old path length (%zu bytes) exceeds the maximal length allowed by the consumer protocol (%zu bytes)",
                                old_path_length + 1, sizeof(msg.u.rotate_rename.old_path));
-               ret = -1;
+               ret = -LTTNG_ERR_INVALID;
                goto error;
        }
 
@@ -1718,7 +1735,7 @@ int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
        if (new_path_length >= sizeof(msg.u.rotate_rename.new_path)) {
                ERR("consumer_rotate_rename: new path length (%zu bytes) exceeds the maximal length allowed by the consumer protocol (%zu bytes)",
                                new_path_length + 1, sizeof(msg.u.rotate_rename.new_path));
-               ret = -1;
+               ret = -LTTNG_ERR_INVALID;
                goto error;
        }
 
@@ -1739,6 +1756,7 @@ int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
        health_code_update();
        ret = consumer_send_msg(socket, &msg);
        if (ret < 0) {
+               ret = -LTTNG_ERR_ROTATE_RENAME_FAIL_CONSUMER;
                goto error;
        }
 
@@ -1774,6 +1792,7 @@ int consumer_check_rotation_pending_local(struct consumer_socket *socket,
        health_code_update();
        ret = consumer_send_msg(socket, &msg);
        if (ret < 0) {
+               ret = -LTTNG_ERR_ROTATION_PENDING_LOCAL_FAIL_CONSUMER;
                goto error;
        }
 
@@ -1819,6 +1838,7 @@ int consumer_check_rotation_pending_relay(struct consumer_socket *socket,
        health_code_update();
        ret = consumer_send_msg(socket, &msg);
        if (ret < 0) {
+               ret = -LTTNG_ERR_ROTATION_PENDING_RELAY_FAIL_CONSUMER;
                goto error;
        }
 
@@ -1858,7 +1878,7 @@ int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
        ret = snprintf(msg.u.mkdir.path, sizeof(msg.u.mkdir.path), "%s", path);
        if (ret < 0 || ret >= sizeof(msg.u.mkdir.path)) {
                ERR("Format path");
-               ret = -1;
+               ret = -LTTNG_ERR_INVALID;
                goto error;
        }
 
@@ -1871,6 +1891,7 @@ int consumer_mkdir(struct consumer_socket *socket, uint64_t session_id,
        health_code_update();
        ret = consumer_send_msg(socket, &msg);
        if (ret < 0) {
+               ret = -LTTNG_ERR_MKDIR_FAIL_CONSUMER;
                goto error;
        }