Cleanup: unused assignment of ret_code in ROTATE_CHANNEL

[lttng-tools.git] / src / common / ust-consumer / ust-consumer.c

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 5db2bb43d7903d47fb5e572e514f2ec9556ba47d..22efc3956656136ff3f5465a17b3bc68a1f782a2 100644 (file)
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -147,7 +147,8 @@ static struct lttng_consumer_channel *allocate_channel(uint64_t session_id,
  */
 static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
                struct lttng_consumer_channel *channel,
-               struct lttng_consumer_local_data *ctx, int *_alloc_ret)
+               struct lttng_consumer_local_data *ctx, int *_alloc_ret,
+               uint64_t trace_archive_id)
 {
        int alloc_ret;
        struct lttng_consumer_stream *stream = NULL;
@@ -166,7 +167,8 @@ static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
                        cpu,
                        &alloc_ret,
                        channel->type,
-                       channel->monitor);
+                       channel->monitor,
+                       trace_archive_id);
        if (stream == NULL) {
                switch (alloc_ret) {
                case -ENOENT:
@@ -267,7 +269,8 @@ end:
  * Return 0 on success else a negative value.
  */
 static int create_ust_streams(struct lttng_consumer_channel *channel,
-               struct lttng_consumer_local_data *ctx)
+               struct lttng_consumer_local_data *ctx,
+               uint64_t trace_archive_id)
 {
        int ret, cpu = 0;
        struct ustctl_consumer_stream *ustream;
@@ -298,7 +301,8 @@ static int create_ust_streams(struct lttng_consumer_channel *channel,
                }
 
                /* Allocate consumer stream object. */
-               stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret);
+               stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret,
+                               trace_archive_id);
                if (!stream) {
                        goto error_alloc;
                }
@@ -639,9 +643,10 @@ error:
  * Return 0 on success or else, a negative value is returned and the channel
  * MUST be destroyed by consumer_del_channel().
  */
-static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
+static int ask_channel(struct lttng_consumer_local_data *ctx,
                struct lttng_consumer_channel *channel,
-               struct ustctl_consumer_channel_attr *attr)
+               struct ustctl_consumer_channel_attr *attr,
+               uint64_t trace_archive_id)
 {
        int ret;
 
@@ -682,7 +687,7 @@ static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
        }
 
        /* Open all streams for this channel. */
-       ret = create_ust_streams(channel, ctx);
+       ret = create_ust_streams(channel, ctx, trace_archive_id);
        if (ret < 0) {
                goto end;
        }
@@ -986,7 +991,8 @@ end:
  * Returns 0 on success, < 0 on error
  */
 static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
-               struct lttng_consumer_local_data *ctx)
+               struct lttng_consumer_local_data *ctx,
+               uint64_t trace_archive_id)
 {
        int ret = 0;
        struct lttng_consumer_channel *metadata_channel;
@@ -1026,7 +1032,7 @@ static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
         * The metadata stream is NOT created in no monitor mode when the channel
         * is created on a sessiond ask channel command.
         */
-       ret = create_ust_streams(metadata_channel, ctx);
+       ret = create_ust_streams(metadata_channel, ctx, trace_archive_id);
        if (ret < 0) {
                goto error;
        }
@@ -1081,7 +1087,8 @@ error:
  * Returns 0 on success, < 0 on error
  */
 static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
-               uint64_t nb_packets_per_stream, struct lttng_consumer_local_data *ctx)
+               uint64_t nb_packets_per_stream,
+               struct lttng_consumer_local_data *ctx)
 {
        int ret;
        unsigned use_relayd = 0;
@@ -1492,7 +1499,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
                health_code_update();
 
-               ret = ask_channel(ctx, sock, channel, &attr);
+               ret = ask_channel(ctx, channel, &attr,
+                               msg.u.ask_channel.trace_archive_id);
                if (ret < 0) {
                        goto end_channel_error;
                }
@@ -1747,7 +1755,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                        ret = snapshot_metadata(msg.u.snapshot_channel.key,
                                        msg.u.snapshot_channel.pathname,
                                        msg.u.snapshot_channel.relayd_id,
-                                       ctx);
+                                       ctx,
+                                       msg.u.snapshot_channel.trace_archive_id);
                        if (ret < 0) {
                                ERR("Snapshot metadata failed");
                                ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
@@ -1996,7 +2005,6 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                                msg.u.rotate_channel.key, ctx);
                if (ret < 0) {
                        ERR("Rotate channel failed");
-                       ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
                }
                break;
        }
@@ -2025,7 +2033,8 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
        }
        case LTTNG_CONSUMER_ROTATE_PENDING_RELAY:
        {
-               uint32_t pending;
+               int pending;
+               uint32_t pending_reply;
 
                DBG("Consumer rotate pending on relay for session %" PRIu64,
                                msg.u.rotate_pending_relay.session_id);
@@ -2036,18 +2045,31 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
                if (pending < 0) {
                        ERR("Rotate pending relay failed");
                        ret_code = LTTCOMM_CONSUMERD_RELAYD_FAIL;
+               } else {
+                       pending_reply = !!pending;
                }
 
                health_code_update();
 
+               /* Send whether the command was successful. */
                ret = consumer_send_status_msg(sock, ret_code);
                if (ret < 0) {
                        /* Somehow, the session daemon is not responding anymore. */
                        goto end_nosignal;
                }
 
-               /* Send back returned value to session daemon */
-               ret = lttcomm_send_unix_sock(sock, &pending, sizeof(pending));
+               if (pending < 0) {
+                       /*
+                        * An error occured while running the command;
+                        * don't send the 'pending' reply as the sessiond
+                        * will not read it.
+                        */
+                       break;
+               }
+
+               /* Send back the command's payload (pending reply). */
+               ret = lttcomm_send_unix_sock(sock, &pending_reply,
+                               sizeof(pending_reply));
                if (ret < 0) {
                        PERROR("send data pending ret code");
                        goto error_fatal;
@@ -3118,7 +3140,7 @@ int lttng_ustconsumer_request_metadata(struct lttng_consumer_local_data *ctx,
        request.key = channel->key;
 
        DBG("Sending metadata request to sessiond, session id %" PRIu64
-                       ", per-pid %" PRIu64 ", app UID %u and channek key %" PRIu64,
+                       ", per-pid %" PRIu64 ", app UID %u and channel key %" PRIu64,
                        request.session_id, request.session_id_per_pid, request.uid,
                        request.key);