X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=791b0425ffc03d0246df18bd3f441a61de07a376;hp=2b44036a2276c224b108fd26760d3063770660c9;hb=83ed9e903336bd1d098d93b62cd6e444f2a8d6f1;hpb=87380d40c7be8994dde5d804f035cb12c368b2c9

diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c
index 2b44036a2..791b0425f 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;
 	}
 
 	/*
@@ -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;
 }
 
@@ -835,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");
@@ -844,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) {
@@ -929,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;
 }