&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;
}
/*
}
session_reset_rotation_state(session, LTTNG_ROTATION_STATE_COMPLETED);
- location = session_get_trace_archive_location(session);
- /* Ownership of location is transferred. */
- ret = notification_thread_command_session_rotation_completed(
- notification_thread_handle,
- session->name,
- session->uid,
- session->gid,
- session->last_archived_chunk_id.value,
- location);
- if (ret != LTTNG_OK) {
- ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
- session->name);
+ if (!session->quiet_rotation) {
+ location = session_get_trace_archive_location(session);
+ /* Ownership of location is transferred. */
+ ret = notification_thread_command_session_rotation_completed(
+ notification_thread_handle,
+ session->name,
+ session->uid,
+ session->gid,
+ session->last_archived_chunk_id.value,
+ location);
+ if (ret != LTTNG_OK) {
+ ERR("[rotation-thread] Failed to notify notification thread of completed rotation for session %s",
+ session->name);
+ }
}
- if (!session->active) {
+ if (!session->active && !session->quiet_rotation) {
/*
* A stop command was issued during the rotation, it is
* up to the rotation completion check to perform the
}
ret = 0;
-end:
+check_ongoing_rotation:
if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) {
uint64_t chunk_being_archived_id;
}
}
+end:
return ret;
}
DBG("[rotation-thread] Launching scheduled time-based rotation on session \"%s\"",
session->name);
- ret = cmd_rotate_session(session, &rotation_return);
+ ret = cmd_rotate_session(session, &rotation_return, false);
if (ret == LTTNG_OK) {
DBG("[rotation-thread] Scheduled time-based rotation successfully launched on session \"%s\"",
session->name);
goto end_unlock;
}
- ret = cmd_rotate_session(session, NULL);
+ ret = cmd_rotate_session(session, NULL, false);
if (ret == -LTTNG_ERR_ROTATION_PENDING) {
DBG("Rotate already pending, subscribe to the next threshold value");
} else if (ret != LTTNG_OK) {
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) {
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 {
error:
DBG("[rotation-thread] Exit");
fini_thread_state(&thread);
+end:
health_unregister(health_sessiond);
rcu_thread_offline();
rcu_unregister_thread();
-end:
return NULL;
}