Fix: sessiond: duplicated rotation notification sent

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

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index ee25baaf1964d8d5a1809a2e1bfc53f5f723d1df..fcbd83fb37b53e60c0bfe7fa47133b09b4f70d48 100644 (file)
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -385,7 +385,7 @@ void check_session_rotation_pending_on_consumers(struct ltt_session *session,
                                &exists_status);
                if (ret) {
                        pthread_mutex_unlock(socket->lock);
-                       ERR("Error occured while checking rotation status on consumer daemon");
+                       ERR("Error occurred while checking rotation status on consumer daemon");
                        goto end;
                }
 
@@ -414,7 +414,7 @@ skip_ust:
                                &exists_status);
                if (ret) {
                        pthread_mutex_unlock(socket->lock);
-                       ERR("Error occured while checking rotation status on consumer daemon");
+                       ERR("Error occurred while checking rotation status on consumer daemon");
                        goto end;
                }
 
@@ -529,38 +529,6 @@ int check_session_rotation_pending(struct ltt_session *session,
                }
        }
 
-       if (!session->active && !session->quiet_rotation) {
-               /*
-                * A stop command was issued during the rotation, it is
-                * up to the rotation completion check to perform the
-                * renaming of the last chunk that was produced.
-                */
-               ret = notification_thread_command_session_rotation_ongoing(
-                               notification_thread_handle,
-                               session->name,
-                               session->uid,
-                               session->gid,
-                               session->most_recent_chunk_id.value);
-               if (ret != LTTNG_OK) {
-                       ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
-                                       session->name);
-               }
-
-               /* Ownership of location is transferred. */
-               location = session_get_trace_archive_location(session);
-               ret = notification_thread_command_session_rotation_completed(
-                               notification_thread_handle,
-                               session->name,
-                               session->uid,
-                               session->gid,
-                               session->most_recent_chunk_id.value,
-                               location);
-               if (ret != LTTNG_OK) {
-                       ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
-                                       session->name);
-               }
-       }
-
        ret = 0;
 check_ongoing_rotation:
        if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
@@ -836,6 +804,10 @@ void *thread_rotation(void *data)
        int queue_pipe_fd;
 
        DBG("[rotation-thread] Started rotation thread");
+       rcu_register_thread();
+       rcu_thread_online();
+       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
+       health_code_update();
 
        if (!handle) {
                ERR("[rotation-thread] Invalid thread context provided");
@@ -845,11 +817,6 @@ void *thread_rotation(void *data)
        queue_pipe_fd = lttng_pipe_get_readfd(
                        handle->rotation_timer_queue->event_pipe);
 
-       rcu_register_thread();
-       rcu_thread_online();
-
-       health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
-       health_code_update();
 
        ret = init_thread_state(handle, &thread);
        if (ret) {
@@ -930,10 +897,10 @@ exit:
 error:
        DBG("[rotation-thread] Exit");
        fini_thread_state(&thread);
+end:
        health_unregister(health_sessiond);
        rcu_thread_offline();
        rcu_unregister_thread();
-end:
        return NULL;
 }