X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=a9f9967a3b49ee04d3fab5beba7b3d27c268c627;hp=c0d1cf146d3b69bbe5fcef59c8cf6d076df8752d;hb=e32d7f274604b77bcd83c24994e88df3761ed658;hpb=03732c3281c0cfbfd5f1a6b7723c577cab43bab3

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index c0d1cf146..a9f9967a3 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -72,7 +72,6 @@ struct rotation_thread_timer_queue {
 };
 
 struct rotation_thread_handle {
-	int quit_pipe;
 	struct rotation_thread_timer_queue *rotation_timer_queue;
 	/* Access to the notification thread cmd_queue */
 	struct notification_thread_handle *notification_thread_handle;
@@ -169,7 +168,6 @@ void rotation_thread_handle_destroy(
 }
 
 struct rotation_thread_handle *rotation_thread_handle_create(
-		int quit_pipe,
 		struct rotation_thread_timer_queue *rotation_timer_queue,
 		struct notification_thread_handle *notification_thread_handle,
 		sem_t *notification_thread_ready)
@@ -181,7 +179,6 @@ struct rotation_thread_handle *rotation_thread_handle_create(
 		goto end;
 	}
 
-	handle->quit_pipe = quit_pipe;
 	handle->rotation_timer_queue = rotation_timer_queue;
 	handle->notification_thread_handle = notification_thread_handle;
 	handle->notification_thread_ready = notification_thread_ready;
@@ -276,15 +273,8 @@ int init_poll_set(struct lttng_poll_event *poll_set,
 	 *	- quit pipe,
 	 *	- rotation thread timer queue pipe,
 	 */
-	ret = lttng_poll_create(poll_set, 2, LTTNG_CLOEXEC);
-	if (ret < 0) {
-		goto end;
-	}
-
-	ret = lttng_poll_add(poll_set, handle->quit_pipe,
-			LPOLLIN | LPOLLERR);
-	if (ret < 0) {
-		ERR("[rotation-thread] Failed to add quit_pipe fd to pollset");
+	ret = sessiond_set_thread_pollset(poll_set, 2);
+	if (ret) {
 		goto error;
 	}
 	ret = lttng_poll_add(poll_set,
@@ -295,7 +285,6 @@ int init_poll_set(struct lttng_poll_event *poll_set,
 		goto error;
 	}
 
-end:
 	return ret;
 error:
 	lttng_poll_clean(poll_set);
@@ -442,7 +431,12 @@ end:
 		session->rotation_pending_local = false;
 	}
 	if (ret) {
-		session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+		ret = session_reset_rotation_state(session,
+				LTTNG_ROTATION_STATE_ERROR);
+		if (ret) {
+			ERR("Failed to reset rotation state of session \"%s\"",
+					session->name);
+		}
 	}
 	return 0;
 }
@@ -502,14 +496,19 @@ int check_session_rotation_pending_relay(struct ltt_session *session)
 		ERR("[rotation-thread] Encountered an error when checking if rotation of trace archive %" PRIu64 " of session \"%s\" is pending on the relay",
 				session->current_archive_id - 1,
 				session->name);
-		session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+		ret = session_reset_rotation_state(session,
+				LTTNG_ROTATION_STATE_ERROR);
+		if (ret) {
+			ERR("Failed to reset rotation state of session \"%s\"",
+					session->name);
+		}
 		rotation_completed = false;
 	}
 
 	rcu_read_unlock();
 
 	if (rotation_completed) {
-		DBG("[rotation-thread] Totation of trace archive %" PRIu64 " of session \"%s\" is complete on the relay",
+		DBG("[rotation-thread] Rotation of trace archive %" PRIu64 " of session \"%s\" is complete on the relay",
 				session->current_archive_id - 1,
 				session->name);
 		session->rotation_pending_relay = false;
@@ -566,7 +565,12 @@ int check_session_rotation_pending(struct ltt_session *session,
 	/* Rename the completed trace archive's location. */
 	now = time(NULL);
 	if (now == (time_t) -1) {
-		session->rotation_state = LTTNG_ROTATION_STATE_ERROR;
+		ret = session_reset_rotation_state(session,
+				LTTNG_ROTATION_STATE_ERROR);
+		if (ret) {
+			ERR("Failed to reset rotation state of session \"%s\"",
+					session->name);
+		}
 		ret = LTTNG_ERR_UNK;
 		goto end;
 	}
@@ -598,6 +602,44 @@ int check_session_rotation_pending(struct ltt_session *session,
 				session->name);
 	}
 
+	if (!session->active) {
+		/*
+		 * 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->current_archive_id);
+		if (ret != LTTNG_OK) {
+			ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
+					session->name);
+		}
+
+		ret = rename_active_chunk(session);
+		if (ret < 0) {
+			ERR("[rotation-thread] Failed to rename active rotation chunk");
+			goto end;
+		}
+
+		/* 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->current_archive_id,
+				location);
+		if (ret != LTTNG_OK) {
+			ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
+					session->name);
+		}
+	}
+
 	ret = 0;
 end:
 	if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
@@ -615,7 +657,7 @@ end:
 	return ret;
 }
 
-/* Call with the session lock held. */
+/* Call with the session and session_list locks held. */
 static
 int launch_session_rotation(struct ltt_session *session)
 {
@@ -664,7 +706,6 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 {
 	int ret = 0;
 	int fd = lttng_pipe_get_readfd(queue->event_pipe);
-	struct ltt_session *session;
 	char buf;
 
 	ret = lttng_read(fd, &buf, 1);
@@ -675,6 +716,7 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 	}
 
 	for (;;) {
+		struct ltt_session *session;
 		struct rotation_thread_job *job;
 
 		/* Take the queue lock only to pop an element from the list. */
@@ -705,14 +747,15 @@ int handle_job_queue(struct rotation_thread_handle *handle,
 			 */
 			session_unlock_list();
 			free(job);
+			session_put(session);
 			continue;
 		}
 
 		session_lock(session);
-		session_unlock_list();
-
 	        ret = run_job(job, session, handle->notification_thread_handle);
 		session_unlock(session);
+		session_put(session);
+		session_unlock_list();
 		free(job);
 		if (ret) {
 			goto end;
@@ -777,7 +820,7 @@ int handle_condition(const struct lttng_condition *condition,
 	ret = unsubscribe_session_consumed_size_rotation(session,
 			notification_thread_handle);
 	if (ret) {
-		goto end;
+		goto end_unlock;
 	}
 
 	ret = cmd_rotate_session(session, NULL);
@@ -800,6 +843,7 @@ int handle_condition(const struct lttng_condition *condition,
 
 end_unlock:
 	session_unlock(session);
+	session_put(session);
 end:
 	return ret;
 }
@@ -819,7 +863,7 @@ int handle_notification_channel(int fd,
 	status = lttng_notification_channel_has_pending_notification(
 			rotate_notification_channel, &notification_pending);
 	if (status != LTTNG_NOTIFICATION_CHANNEL_STATUS_OK) {
-		ERR("[rotation-thread ]Error occured while checking for pending notification");
+		ERR("[rotation-thread ]Error occurred while checking for pending notification");
 		ret = -1;
 		goto end;
 	}
@@ -884,7 +928,7 @@ void *thread_rotation(void *data)
 
 	ret = init_thread_state(handle, &thread);
 	if (ret) {
-		goto end;
+		goto error;
 	}
 
 	/* Ready to handle client connections. */
@@ -922,7 +966,7 @@ void *thread_rotation(void *data)
 				goto error;
 			}
 
-			if (fd == handle->quit_pipe) {
+			if (sessiond_check_thread_quit_pipe(fd, revents)) {
 				DBG("[rotation-thread] Quit pipe activity");
 				/* TODO flush the queue. */
 				goto exit;
@@ -937,7 +981,7 @@ void *thread_rotation(void *data)
 				ret = handle_notification_channel(fd, handle,
 						&thread);
 				if (ret) {
-					ERR("[rotation-thread] Error occured while handling activity on notification channel socket");
+					ERR("[rotation-thread] Error occurred while handling activity on notification channel socket");
 					goto error;
 				}
 			}