X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=a2af4c38aa40a9a040ecb5e911408367d9ef2213;hp=606811e18b791784660b5145d9042b675f38dc31;hb=d88744a44aa5f2ca90ab87946692b9eed3120641;hpb=5c408ad8ef08a226c018702aca969536f36ac4e5

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 606811e18..a2af4c38a 100644
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2651,6 +2651,10 @@ int cmd_stop_trace(struct ltt_session *session)
 		goto error;
 	}
 
+	if (session->rotate_relay_pending_timer_enabled) {
+		sessiond_timer_rotate_pending_stop(session);
+	}
+
 	if (session->rotate_count > 0 && !session->rotate_pending) {
 		ret = rename_active_chunk(session);
 		if (ret) {
@@ -2949,6 +2953,10 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
 
 	DBG("Begin destroy session %s (id %" PRIu64 ")", session->name, session->id);
 
+	if (session->rotate_relay_pending_timer_enabled) {
+		sessiond_timer_rotate_pending_stop(session);
+	}
+
 	/*
 	 * The rename of the current chunk is performed at stop, but if we rotated
 	 * the session after the previous stop command, we need to rename the