From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Wed, 20 Nov 2019 21:06:30 +0000 (-0500)
Subject: Fix: sessiond: duplicated rotation notification sent
X-Git-Tag: v2.12.0-rc1~235
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=8c9211169fda5c183b0cf1f94c01721fdb5ccba5;ds=sidebyside

Fix: sessiond: duplicated rotation notification sent

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>
---

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 791b0425f..fcbd83fb3 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -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) {