X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=ee25baaf1964d8d5a1809a2e1bfc53f5f723d1df;hb=a3bc3918a3e9f219cc54adcc41dd6b37381b30ff;hp=af09ca0a5cb633bd04681ed382082b60689f7629;hpb=7fdbed1c109a618ee160018d121d5096dd14bd08;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index af09ca0a5..ee25baaf1 100644
--- a/src/bin/lttng-sessiond/rotation-thread.c
+++ b/src/bin/lttng-sessiond/rotation-thread.c
@@ -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;
 	}
 
 	/*
@@ -562,7 +562,7 @@ int check_session_rotation_pending(struct ltt_session *session,
 	}
 
 	ret = 0;
-end:
+check_ongoing_rotation:
 	if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
 		uint64_t chunk_being_archived_id;
 
@@ -582,6 +582,7 @@ end:
 		}
 	}
 
+end:
 	return ret;
 }
 
@@ -832,8 +833,7 @@ 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");
 
@@ -842,6 +842,9 @@ void *thread_rotation(void *data)
 		goto end;
 	}
 
+	queue_pipe_fd = lttng_pipe_get_readfd(
+			handle->rotation_timer_queue->event_pipe);
+
 	rcu_register_thread();
 	rcu_thread_online();
 
@@ -914,7 +917,6 @@ void *thread_rotation(void *data)
 					ret = lttng_read(fd, &buf, 1);
 					if (ret != 1) {
 						ERR("[rotation-thread] Failed to read from wakeup pipe (fd = %i)", fd);
-						ret = -1;
 						goto error;
 					}
 				} else {