&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;
}
&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;
}
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);
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
*/
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;
}
/*
}
ret = 0;
-end:
+check_ongoing_rotation:
if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
uint64_t chunk_being_archived_id;
}
}
+end:
return ret;
}
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");
+ 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");
goto end;
}
- rcu_register_thread();
- rcu_thread_online();
+ queue_pipe_fd = lttng_pipe_get_readfd(
+ handle->rotation_timer_queue->event_pipe);
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_ROTATION);
- health_code_update();
ret = init_thread_state(handle, &thread);
if (ret) {
error:
DBG("[rotation-thread] Exit");
fini_thread_state(&thread);
+end:
health_unregister(health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
-end:
return NULL;
}