Add the GMT offset in the rotated chunk path

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

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 20a7efb402a2314a9fcc006dbf4c84439e5a099f..160c19f598329ec03c6d82023ad55f09bc38db03 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -69,7 +69,9 @@ static char *create_channel_path(struct consumer_output *consumer,
                }
                DBG3("Kernel local consumer tracefile path: %s", pathname);
        } else {
-               ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+               ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
+                               consumer->dst.net.base_dir,
+                               consumer->subdir);
                if (ret < 0) {
                        PERROR("snprintf kernel metadata path");
                        goto error;
@@ -216,7 +218,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        /* Prep channel message structure */
        consumer_init_channel_comm_msg(&lkm,
                        LTTNG_CONSUMER_ADD_CHANNEL,
-                       session->metadata->fd,
+                       session->metadata->key,
                        session->id,
                        pathname,
                        session->uid,
@@ -241,7 +243,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        /* Prep stream message structure */
        consumer_init_stream_comm_msg(&lkm,
                        LTTNG_CONSUMER_ADD_STREAM,
-                       session->metadata->fd,
+                       session->metadata->key,
                        session->metadata_stream_fd,
                        0); /* CPU: 0 for metadata. */
 
@@ -495,11 +497,11 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
        assert(metadata);
        assert(socket);
 
-       DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+       DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);
 
        memset(&msg, 0, sizeof(msg));
        msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-       msg.u.destroy_channel.key = metadata->fd;
+       msg.u.destroy_channel.key = metadata->key;
 
        pthread_mutex_lock(socket->lock);
        health_code_update();