X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=d12bd9d0150cf1b998ba6bde49343f31f17c78e4;hp=05627f9345d6151e28db2a3534a99c9f1b5d08b9;hb=f620cc284daf7e87d17da0faf9e3652e60c8fb05;hpb=6ae1bf4602f7bfd3a1a206aaf98295191cef5082

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 05627f934..d12bd9d01 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
@@ -836,6 +836,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 +849,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 +929,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;
 }