X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=fcbd83fb37b53e60c0bfe7fa47133b09b4f70d48;hp=7bd6c681982fe1c18b6f0b039176650f17d6af2a;hb=8c9211169fda5c183b0cf1f94c01721fdb5ccba5;hpb=49176d734e1f76006e7b1678ba7f593d8f34717d

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 7bd6c6819..fcbd83fb3 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -385,7 +385,7 @@ void check_session_rotation_pending_on_consumers(struct ltt_session *session,
 				&exists_status);
 		if (ret) {
 			pthread_mutex_unlock(socket->lock);
-			ERR("Error occured while checking rotation status on consumer daemon");
+			ERR("Error occurred while checking rotation status on consumer daemon");
 			goto end;
 		}
 
@@ -414,7 +414,7 @@ skip_ust:
 				&exists_status);
 		if (ret) {
 			pthread_mutex_unlock(socket->lock);
-			ERR("Error occured while checking rotation status on consumer daemon");
+			ERR("Error occurred while checking rotation status on consumer daemon");
 			goto end;
 		}
 
@@ -467,6 +467,11 @@ int check_session_rotation_pending(struct ltt_session *session,
 	const char *archived_chunk_name;
 	uint64_t chunk_being_archived_id;
 
+	if (!session->chunk_being_archived) {
+		ret = 0;
+		goto end;
+	}
+
 	chunk_status = lttng_trace_chunk_get_id(session->chunk_being_archived,
 			&chunk_being_archived_id);
 	assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
@@ -474,11 +479,6 @@ int check_session_rotation_pending(struct ltt_session *session,
 	DBG("[rotation-thread] Checking for pending rotation on session \"%s\", trace archive %" PRIu64,
 			session->name, chunk_being_archived_id);
 
-	if (!session->chunk_being_archived) {
-		ret = 0;
-		goto end;
-	}
-
 	/*
 	 * The rotation-pending check timer of a session is launched in
 	 * one-shot mode. If the rotation is incomplete, the rotation
@@ -489,14 +489,14 @@ int check_session_rotation_pending(struct ltt_session *session,
 	 */
 	ret = timer_session_rotation_pending_check_stop(session);
 	if (ret) {
-		goto end;
+		goto check_ongoing_rotation;
 	}
 
 	check_session_rotation_pending_on_consumers(session,
 			&rotation_completed);
 	if (!rotation_completed ||
 			session->rotation_state == LTTNG_ROTATION_STATE_ERROR) {
-		goto end;
+		goto check_ongoing_rotation;
 	}
 
 	/*
@@ -529,40 +529,8 @@ 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;
-end:
+check_ongoing_rotation:
 	if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
 		uint64_t chunk_being_archived_id;
 
@@ -582,6 +550,7 @@ end:
 		}
 	}
 
+end:
 	return ret;
 }
 
@@ -832,21 +801,22 @@ void *thread_rotation(void *data)
 	int ret;
 	struct rotation_thread_handle *handle = data;
 	struct rotation_thread thread;
-	const int queue_pipe_fd = lttng_pipe_get_readfd(
-			handle->rotation_timer_queue->event_pipe);
+	int queue_pipe_fd;
 
 	DBG("[rotation-thread] Started rotation thread");
+	rcu_register_thread();
+	rcu_thread_online();
+	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
+	health_code_update();
 
 	if (!handle) {
 		ERR("[rotation-thread] Invalid thread context provided");
 		goto end;
 	}
 
-	rcu_register_thread();
-	rcu_thread_online();
+	queue_pipe_fd = lttng_pipe_get_readfd(
+			handle->rotation_timer_queue->event_pipe);
 
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
-	health_code_update();
 
 	ret = init_thread_state(handle, &thread);
 	if (ret) {
@@ -927,10 +897,10 @@ exit:
 error:
 	DBG("[rotation-thread] Exit");
 	fini_thread_state(&thread);
+end:
 	health_unregister(health_sessiond);
 	rcu_thread_offline();
 	rcu_unregister_thread();
-end:
 	return NULL;
 }