Fix: sessiond: duplicated rotation notification sent
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 20 Nov 2019 21:06:30 +0000 (16:06 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Wed, 20 Nov 2019 21:16:30 +0000 (16:16 -0500)
A duplicate notification that a rotation was launched and completed
is sent by the rotation thread when a rotation is performed after
a session was stopped.

This code is removed at it is a left-over from the time when the
rotation thread had to explicitly rename trace output folders
when a rotation had completed.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng-sessiond/rotation-thread.c

index 791b0425ffc03d0246df18bd3f441a61de07a376..fcbd83fb37b53e60c0bfe7fa47133b09b4f70d48 100644 (file)
@@ -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) {
        ret = 0;
 check_ongoing_rotation:
        if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
This page took 0.034561 seconds and 4 git commands to generate.