X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.cpp;fp=src%2Fbin%2Flttng-sessiond%2Frotation-thread.cpp;h=22891dd13ec4d5f20c99d10aa650c0fe0af65e7c;hp=5efc24edda31b81af320718c4f05bcbd2f5774e2;hb=2545db87957d24f43e2e2d5c49bb56b31bb9180a;hpb=6d31b87d46a9301fe86d273616ab3d7214d24e65

diff --git a/src/bin/lttng-sessiond/rotation-thread.cpp b/src/bin/lttng-sessiond/rotation-thread.cpp
index 5efc24edd..22891dd13 100644
--- a/src/bin/lttng-sessiond/rotation-thread.cpp
+++ b/src/bin/lttng-sessiond/rotation-thread.cpp
@@ -693,19 +693,28 @@ int handle_condition(const struct lttng_notification *notification,
 		goto end_unlock;
 	}
 
-	ret = cmd_rotate_session(session, NULL, false,
-		LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
-	if (ret == -LTTNG_ERR_ROTATION_PENDING) {
+	ret = cmd_rotate_session(
+			session, NULL, false, LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
+	switch (ret) {
+	case LTTNG_OK:
+		break;
+	case -LTTNG_ERR_ROTATION_PENDING:
 		DBG("Rotate already pending, subscribe to the next threshold value");
-	} else if (ret != LTTNG_OK) {
-		ERR("Failed to rotate on size notification with error: %s",
-				lttng_strerror(ret));
+		break;
+	case -LTTNG_ERR_ROTATION_MULTIPLE_AFTER_STOP:
+		DBG("Rotation already happened since last stop, subscribe to the next threshold value");
+		break;
+	case -LTTNG_ERR_ROTATION_AFTER_STOP_CLEAR:
+		DBG("Rotation already happened since last stop and clear, subscribe to the next threshold value");
+		break;
+	default:
+		ERR("Failed to rotate on size notification with error: %s", lttng_strerror(ret));
 		ret = -1;
 		goto end_unlock;
 	}
-	ret = subscribe_session_consumed_size_rotation(session,
-			consumed + session->rotate_size,
-			notification_thread_handle);
+
+	ret = subscribe_session_consumed_size_rotation(
+			session, consumed + session->rotate_size, notification_thread_handle);
 	if (ret) {
 		ERR("Failed to subscribe to session consumed size condition");
 		goto end_unlock;