X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=54a3cc62db9f8bd407561c1b465dde61f6c9eb0d;hp=ee25baaf1964d8d5a1809a2e1bfc53f5f723d1df;hb=a2b988e2cc31f76365b600ca4e3a26604de00022;hpb=dc1d59677f2e7686dc33b095663b95eb1ccf89e6

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index ee25baaf1..54a3cc62d 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -111,33 +111,6 @@ end:
 	return queue;
 }
 
-void log_job_destruction(const struct rotation_thread_job *job)
-{
-	enum lttng_error_level log_level;
-	const char *job_type_str = get_job_type_str(job->type);
-
-	switch (job->type) {
-	case ROTATION_THREAD_JOB_TYPE_SCHEDULED_ROTATION:
-		/*
-		 * Not a problem, the scheduled rotation is racing with the teardown
-		 * of the daemon. In this case, the rotation will not happen, which
-		 * is not a problem (or at least, not important enough to delay
-		 * the shutdown of the session daemon).
-		 */
-		log_level = PRINT_DBG;
-		break;
-	case ROTATION_THREAD_JOB_TYPE_CHECK_PENDING_ROTATION:
-		/* This is not expected to happen; warn the user. */
-		log_level = PRINT_WARN;
-		break;
-	default:
-		abort();
-	}
-
-	LOG(log_level, "Rotation thread timer queue still contains job of type %s targeting session \"%s\" on destruction",
-			job_type_str, job->session->name);
-}
-
 void rotation_thread_timer_queue_destroy(
 		struct rotation_thread_timer_queue *queue)
 {
@@ -385,7 +358,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 +387,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;
 		}
 
@@ -529,38 +502,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) {
@@ -596,7 +537,8 @@ int launch_session_rotation(struct ltt_session *session)
 	DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
 			session->name);
 
-	ret = cmd_rotate_session(session, &rotation_return, false);
+	ret = cmd_rotate_session(session, &rotation_return, false,
+		LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 	if (ret == LTTNG_OK) {
 		DBG("[rotation-thread] Scheduled time-based rotation successfully launched on session \"%s\"",
 				session->name);
@@ -743,7 +685,8 @@ int handle_condition(const struct lttng_condition *condition,
 		goto end_unlock;
 	}
 
-	ret = cmd_rotate_session(session, NULL, false);
+	ret = cmd_rotate_session(session, NULL, false,
+		LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED);
 	if (ret == -LTTNG_ERR_ROTATION_PENDING) {
 		DBG("Rotate already pending, subscribe to the next threshold value");
 	} else if (ret != LTTNG_OK) {
@@ -828,6 +771,7 @@ end:
 	return ret;
 }
 
+static
 void *thread_rotation(void *data)
 {
 	int ret;
@@ -836,6 +780,10 @@ void *thread_rotation(void *data)
 	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");
@@ -845,11 +793,6 @@ void *thread_rotation(void *data)
 	queue_pipe_fd = lttng_pipe_get_readfd(
 			handle->rotation_timer_queue->event_pipe);
 
-	rcu_register_thread();
-	rcu_thread_online();
-
-	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
-	health_code_update();
 
 	ret = init_thread_state(handle, &thread);
 	if (ret) {
@@ -930,10 +873,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;
 }