correct path sent to the consumer even with a relay

[deliverable/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 13d96578d78681d79b34ec6aa63726e2d85b72cb..085c8cbcf19e008aa8e974a652188070eb2177f2 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -1591,9 +1591,13 @@ end:
        return ret;
 }
 
+/*
+ * Ask the consumer to rotate a channel.
+ * app_pathname only used for UST, it contains the path after /ust/.
+ */
 int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
                uid_t uid, gid_t gid, struct consumer_output *output,
-               char *tmp, uint32_t metadata)
+               char *app_pathname, uint32_t metadata)
 {
        int ret;
        struct lttcomm_consumer_msg msg;
@@ -1609,39 +1613,20 @@ int consumer_rotate_channel(struct consumer_socket *socket, uint64_t key,
        msg.u.rotate_channel.metadata = metadata;
 
        if (output->type == CONSUMER_DST_NET) {
-               ERR("TODO");
-               ret = -1;
-               goto error;
-               /*
-               msg.u.rotate_channel.relayd_id = output->consumer->net_seq_index;
-               ret = snprintf(msg.u.rotate_channel.pathname,
-                               sizeof(msg.u.rotate_channel.pathname),
-                               "%s/%s-%s-%" PRIu64 "%s", output->consumer->subdir,
-                               output->name, output->datetime, output->nb_rotate,
-                               session_path);
-               if (ret < 0) {
-                       ret = -LTTNG_ERR_NOMEM;
-                       goto error;
-               }
-               */
+               fprintf(stderr, "BASE: %s\n", output->dst.net.base_dir);
+               fprintf(stderr, "CHUNK: %s\n", output->chunk_path);
+               msg.u.rotate_channel.relayd_id = output->net_seq_index;
+               snprintf(msg.u.rotate_channel.pathname, PATH_MAX, "%s%s%s",
+                               output->dst.net.base_dir,
+                               output->chunk_path, app_pathname);
+               fprintf(stderr, "SENDING: %s\n", msg.u.rotate_channel.pathname);
        } else {
                msg.u.rotate_channel.relayd_id = (uint64_t) -1ULL;
-               snprintf(msg.u.rotate_channel.pathname, PATH_MAX, "%s/%s/%s",
+               snprintf(msg.u.rotate_channel.pathname, PATH_MAX, "%s%s%s",
                                output->dst.session_root_path,
-                               output->chunk_path, tmp);
+                               output->chunk_path, app_pathname);
                fprintf(stderr, "rotate to %s\n",
                                msg.u.rotate_channel.pathname);
-
-               /* Create directory. Ignore if exist. */
-               /* FIXME: not sure this is useful */
-               ret = run_as_mkdir_recursive(msg.u.rotate_channel.pathname,
-                               S_IRWXU | S_IRWXG, uid, gid);
-               if (ret < 0) {
-                       if (errno != EEXIST) {
-                               ERR("Trace directory creation error");
-                               goto error;
-                       }
-               }
        }
 
        health_code_update();
@@ -1675,6 +1660,8 @@ int consumer_rotate_rename(struct consumer_socket *socket, uint64_t session_id,
        msg.u.rotate_rename.gid = gid;
 
        if (output->type == CONSUMER_DST_NET) {
+               fprintf(stderr, "SUBDIR: %s\n", output->subdir);
+               fprintf(stderr, "SUBDIR: %s\n", output->dst.net.control.subdir);
                ERR("TODO");
                ret = -1;
                msg.u.rotate_rename.relayd_id = output->net_seq_index;