quick fixes

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>

diff --git a/src/bin/lttng-sessiond/rotate.c b/src/bin/lttng-sessiond/rotate.c
index 98207f00aae9ca0f00bee52513eb833f5280cff6..d99e2d9ff6a5beaab6dd483b8cb53670f7d2033b 100644 (file)
--- a/src/bin/lttng-sessiond/rotate.c
+++ b/src/bin/lttng-sessiond/rotate.c
@@ -249,7 +249,7 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
                        }
                }
                if (session->ust_session) {
-                       fprintf(stderr, "rename %s/kernel to %s\n",
+                       fprintf(stderr, "rename %s/ust to %s\n",
                                        session->rotation_chunk.current_rotate_path,
                                        new_path);
                        ret = rename_first_chunk(session,
@@ -291,7 +291,6 @@ int rename_complete_chunk(struct ltt_session *session, time_t ts)
         */
        snprintf(session->rotation_chunk.current_rotate_path, PATH_MAX,
                        "%s", new_path);
-       session->rotate_pending = 0;
 
        goto end;
 

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 4f7ac86e5b082eb931ab5fa5493405bc758cc247..3269f71a16efe3a553b8c48e02bcfc3c70b09117 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -323,6 +323,7 @@ int handle_channel_rotation_pipe(int fd, uint32_t revents,
                        ERR("Failed to rename completed rotation chunk");
                        goto end;
                }
+               channel_info->session->rotate_pending = 0;
        }
 
        channel_rotation_info_destroy(channel_info);