X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=2fed39fc75a5051fb1b72d006ac95db528075ad8;hb=50eba12b374614643f2e16f5c1f07622d3c4e4ac;hp=9f15ed06edacbae130cef7ac9e4c0c7793ecee87;hpb=90936dcf0968343f20b2f6fd365b9c015cdb9717;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 9f15ed06e..2fed39fc7 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -395,7 +395,6 @@ int handle_channel_rotation_pipe(int fd, uint32_t revents,
 			goto end_unlock_session;
 		}
 		session->rotate_pending = false;
-		session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
 		session->last_chunk_start_ts = session->current_chunk_start_ts;
 		if (session->rotate_pending_relay) {
 			ret = sessiond_timer_rotate_pending_start(
@@ -406,6 +405,8 @@ int handle_channel_rotation_pipe(int fd, uint32_t revents,
 				ret = -1;
 				goto end_unlock_session;
 			}
+		} else {
+			session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
 		}
 		DBG("Rotation completed for session %s", session->name);
 	}
@@ -445,6 +446,7 @@ int rotate_pending_relay_timer(struct ltt_session *session)
 		 * rotations can start now.
 		 */
 		session->rotate_pending_relay = false;
+		session->rotation_state = LTTNG_ROTATION_STATE_COMPLETED;
 	} else if (ret == 1) {
 		DBG("[rotation-thread] Rotation still pending on the relay for "
 				"session %" PRIu64, session->id);
@@ -794,7 +796,7 @@ void *thread_rotation(void *data)
 				ret = handle_channel_rotation_pipe(fd,
 						revents, handle, &state);
 				if (ret) {
-					ERR("[rotation-thread] Handle channel rotation pipe");
+					ERR("[rotation-thread] Failed to handle channel rotation pipe");
 					goto error;
 				}
 			} else if (fd == rotate_notification_channel->socket) {