#include <urcu/list.h>
#include <urcu/uatomic.h>
#include <sys/stat.h>
+#include <stdio.h>
#include <common/defaults.h>
#include <common/common.h>
#include <common/dynamic-buffer.h>
#include <common/buffer-view.h>
#include <common/trace-chunk.h>
+#include <lttng/location-internal.h>
#include <lttng/trigger/trigger-internal.h>
#include <lttng/condition/condition.h>
#include <lttng/action/action.h>
/* Sleep for 100ms between each check for the shm path's deletion. */
#define SESSION_DESTROY_SHM_PATH_CHECK_DELAY_US 100000
+struct cmd_destroy_session_reply_context {
+ int reply_sock_fd;
+ bool implicit_rotation_on_destroy;
+};
+
static enum lttng_error_code wait_on_path(void *path);
/*
struct consumer_output *consumer,
struct consumer_socket *consumer_sock,
const char *session_name, const char *hostname,
- int session_live_timer)
+ int session_live_timer,
+ const uint64_t *current_chunk_id,
+ time_t session_creation_time)
{
int ret;
struct lttcomm_relayd_sock *rsock = NULL;
/* Send relayd socket to consumer. */
ret = consumer_send_relayd_socket(consumer_sock, rsock, consumer,
relayd_uri->stype, session_id,
- session_name, hostname, session_live_timer);
+ session_name, hostname, session_live_timer,
+ current_chunk_id, session_creation_time);
if (ret < 0) {
status = LTTNG_ERR_ENABLE_CONSUMER_FAIL;
goto close_sock;
enum lttng_domain_type domain,
unsigned int session_id, struct consumer_output *consumer,
struct consumer_socket *sock, const char *session_name,
- const char *hostname, int session_live_timer)
+ const char *hostname, int session_live_timer,
+ const uint64_t *current_chunk_id, time_t session_creation_time)
{
enum lttng_error_code status = LTTNG_OK;
if (!sock->control_sock_sent) {
status = send_consumer_relayd_socket(session_id,
&consumer->dst.net.control, consumer, sock,
- session_name, hostname, session_live_timer);
+ session_name, hostname, session_live_timer,
+ current_chunk_id, session_creation_time);
if (status != LTTNG_OK) {
goto error;
}
if (!sock->data_sock_sent) {
status = send_consumer_relayd_socket(session_id,
&consumer->dst.net.data, consumer, sock,
- session_name, hostname, session_live_timer);
+ session_name, hostname, session_live_timer,
+ current_chunk_id, session_creation_time);
if (status != LTTNG_OK) {
goto error;
}
struct ltt_kernel_session *ksess;
struct consumer_socket *socket;
struct lttng_ht_iter iter;
+ LTTNG_OPTIONAL(uint64_t) current_chunk_id = {};
- assert(session);
+ assert(session);
usess = session->ust_session;
ksess = session->kernel_session;
DBG("Setting relayd for session %s", session->name);
+ if (session->current_trace_chunk) {
+ enum lttng_trace_chunk_status status = lttng_trace_chunk_get_id(
+ session->current_trace_chunk, ¤t_chunk_id.value);
+
+ if (status == LTTNG_TRACE_CHUNK_STATUS_OK) {
+ current_chunk_id.is_set = true;
+ } else {
+ ERR("Failed to get current trace chunk id");
+ ret = LTTNG_ERR_UNK;
+ goto error;
+ }
+ }
+
rcu_read_lock();
if (usess && usess->consumer && usess->consumer->type == CONSUMER_DST_NET
ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_UST, session->id,
usess->consumer, socket,
session->name, session->hostname,
- session->live_timer);
+ session->live_timer,
+ current_chunk_id.is_set ? ¤t_chunk_id.value : NULL,
+ session->creation_time);
pthread_mutex_unlock(socket->lock);
if (ret != LTTNG_OK) {
goto error;
ret = send_consumer_relayd_sockets(LTTNG_DOMAIN_KERNEL, session->id,
ksess->consumer, socket,
session->name, session->hostname,
- session->live_timer);
+ session->live_timer,
+ current_chunk_id.is_set ? ¤t_chunk_id.value : NULL,
+ session->creation_time);
pthread_mutex_unlock(socket->lock);
if (ret != LTTNG_OK) {
goto error;
return -ret;
}
-static
-int domain_mkdir(const struct consumer_output *output,
- const struct ltt_session *session,
- uid_t uid, gid_t gid)
-{
- struct consumer_socket *socket;
- struct lttng_ht_iter iter;
- int ret;
- char path[LTTNG_PATH_MAX];
-
- if (!output || !output->socks) {
- ERR("No consumer output found");
- ret = -1;
- goto end;
- }
-
- ret = snprintf(path, sizeof(path), "%s/%s%s",
- session_get_base_path(session),
- output->chunk_path,
- output->domain_subdir);
- if (ret < 0 || ret >= LTTNG_PATH_MAX) {
- ERR("Failed to format path new chunk domain path");
- ret = -1;
- goto end;
- }
-
- DBG("Domain mkdir %s for session %" PRIu64, path, session->id);
- rcu_read_lock();
- /*
- * We have to iterate to find a socket, but we only need to send the
- * rename command to one consumer, so we break after the first one.
- */
- cds_lfht_for_each_entry(output->socks->ht, &iter.iter, socket, node.node) {
- pthread_mutex_lock(socket->lock);
- ret = consumer_mkdir(socket, session->id, output, path, uid, gid);
- pthread_mutex_unlock(socket->lock);
- if (ret) {
- ERR("Failed to create directory at \"%s\"", path);
- ret = -1;
- goto end_unlock;
- }
- break;
- }
-
- ret = 0;
-
-end_unlock:
- rcu_read_unlock();
-end:
- return ret;
-}
-
/*
* Command LTTNG_START_TRACE processed by the client thread.
*
goto error;
}
- if (!session->has_been_started && session->output_traces) {
- ret = session_switch_trace_chunk(session, NULL, NULL);
- if (ret != LTTNG_OK) {
+ if (session->output_traces && !session->current_trace_chunk &&
+ session_output_supports_trace_chunks(session)) {
+ struct lttng_trace_chunk *trace_chunk;
+
+ trace_chunk = session_create_new_trace_chunk(
+ session, NULL, NULL, NULL);
+ if (!trace_chunk) {
+ ret = LTTNG_ERR_CREATE_DIR_FAIL;
+ goto error;
+ }
+ assert(!session->current_trace_chunk);
+ ret = session_set_trace_chunk(session, trace_chunk, NULL);
+ lttng_trace_chunk_put(trace_chunk);
+ if (ret) {
+ ret = LTTNG_ERR_CREATE_TRACE_CHUNK_FAIL_CONSUMER;
goto error;
}
}
return ret_code;
}
+static
+void cmd_destroy_session_reply(const struct ltt_session *session,
+ void *_reply_context)
+{
+ int ret;
+ ssize_t comm_ret;
+ const struct cmd_destroy_session_reply_context *reply_context =
+ _reply_context;
+ struct lttng_dynamic_buffer payload;
+ struct lttcomm_session_destroy_command_header cmd_header;
+ struct lttng_trace_archive_location *location = NULL;
+ struct lttcomm_lttng_msg llm = {
+ .cmd_type = LTTNG_DESTROY_SESSION,
+ .ret_code = LTTNG_OK,
+ .pid = UINT32_MAX,
+ .cmd_header_size =
+ sizeof(struct lttcomm_session_destroy_command_header),
+ .data_size = 0,
+ };
+ size_t payload_size_before_location;
+
+ lttng_dynamic_buffer_init(&payload);
+
+ ret = lttng_dynamic_buffer_append(&payload, &llm, sizeof(llm));
+ if (ret) {
+ ERR("Failed to append session destruction message");
+ goto error;
+ }
+
+ cmd_header.rotation_state =
+ (int32_t) (reply_context->implicit_rotation_on_destroy ?
+ session->rotation_state :
+ LTTNG_ROTATION_STATE_NO_ROTATION);
+ ret = lttng_dynamic_buffer_append(&payload, &cmd_header,
+ sizeof(cmd_header));
+ if (ret) {
+ ERR("Failed to append session destruction command header");
+ goto error;
+ }
+
+ if (!reply_context->implicit_rotation_on_destroy) {
+ DBG("No implicit rotation performed during the destruction of session \"%s\", sending reply",
+ session->name);
+ goto send_reply;
+ }
+ if (session->rotation_state != LTTNG_ROTATION_STATE_COMPLETED) {
+ DBG("Rotation state of session \"%s\" is not \"completed\", sending session destruction reply",
+ session->name);
+ goto send_reply;
+ }
+
+ location = session_get_trace_archive_location(session);
+ if (!location) {
+ ERR("Failed to get the location of the trace archive produced during the destruction of session \"%s\"",
+ session->name);
+ goto error;
+ }
+
+ payload_size_before_location = payload.size;
+ comm_ret = lttng_trace_archive_location_serialize(location,
+ &payload);
+ if (comm_ret < 0) {
+ ERR("Failed to serialize the location of the trace archive produced during the destruction of session \"%s\"",
+ session->name);
+ goto error;
+ }
+ /* Update the message to indicate the location's length. */
+ ((struct lttcomm_lttng_msg *) payload.data)->data_size =
+ payload.size - payload_size_before_location;
+send_reply:
+ comm_ret = lttcomm_send_unix_sock(reply_context->reply_sock_fd,
+ payload.data, payload.size);
+ if (comm_ret != (ssize_t) payload.size) {
+ ERR("Failed to send result of the destruction of session \"%s\" to client",
+ session->name);
+ }
+error:
+ ret = close(reply_context->reply_sock_fd);
+ if (ret) {
+ PERROR("Failed to close client socket in deferred session destroy reply");
+ }
+ lttng_dynamic_buffer_reset(&payload);
+ free(_reply_context);
+}
+
/*
* Command LTTNG_DESTROY_SESSION processed by the client thread.
*
* Called with session lock held.
*/
int cmd_destroy_session(struct ltt_session *session,
- struct notification_thread_handle *notification_thread_handle)
+ struct notification_thread_handle *notification_thread_handle,
+ int *sock_fd)
{
int ret;
+ struct cmd_destroy_session_reply_context *reply_context = NULL;
+
+ if (sock_fd) {
+ reply_context = zmalloc(sizeof(*reply_context));
+ if (!reply_context) {
+ ret = LTTNG_ERR_NOMEM;
+ goto end;
+ }
+ reply_context->reply_sock_fd = *sock_fd;
+ }
/* Safety net */
assert(session);
- DBG("Begin destroy session %s (id %" PRIu64 ")", session->name, session->id);
+ DBG("Begin destroy session %s (id %" PRIu64 ")", session->name,
+ session->id);
+ if (session->active) {
+ DBG("Session \"%s\" is active, attempting to stop it before destroying it",
+ session->name);
+ ret = cmd_stop_trace(session);
+ if (ret != LTTNG_OK && ret != LTTNG_ERR_TRACE_ALREADY_STOPPED) {
+ /* Carry on with the destruction of the session. */
+ ERR("Failed to stop session \"%s\" as part of its destruction: %s",
+ session->name, lttng_strerror(-ret));
+ }
+ }
if (session->rotation_schedule_timer_enabled) {
if (timer_session_rotation_schedule_timer_stop(
session->rotate_size = 0;
}
- if (session->current_archive_id != 0) {
- if (!session->rotated_after_last_stop) {
- ret = cmd_rotate_session(session, NULL);
- if (ret != LTTNG_OK) {
- ERR("Failed to perform an implicit rotation as part of the rotation: %s", lttng_strerror(-ret));
- }
- } else {
- /*
- * Rename the active chunk to ensure it has a name
- * of the form ts_begin-ts_end-id.
- *
- * Note that no trace data has been produced since
- * the last rotation; the directory should be
- * removed.
- */
- ret = rename_active_chunk(session);
- if (ret) {
- ERR("Failed to rename active chunk during the destruction of session \"%s\"",
- session->name);
- }
+ if (session->most_recent_chunk_id.is_set &&
+ session->most_recent_chunk_id.value != 0 &&
+ session->current_trace_chunk) {
+ ret = cmd_rotate_session(session, NULL);
+ if (ret != LTTNG_OK) {
+ ERR("Failed to perform an implicit rotation as part of the destruction of session \"%s\": %s",
+ session->name, lttng_strerror(-ret));
}
- }
+ if (reply_context) {
+ reply_context->implicit_rotation_on_destroy = true;
+ }
+ }
if (session->shm_path[0]) {
/*
* _at least_ up to the point when that reference is released.
*/
session_destroy(session);
- ret = LTTNG_OK;
-
+ if (reply_context) {
+ ret = session_add_destroy_notifier(session,
+ cmd_destroy_session_reply,
+ (void *) reply_context);
+ if (ret) {
+ ret = LTTNG_ERR_FATAL;
+ goto end;
+ } else {
+ *sock_fd = -1;
+ }
+ }
+ ret = LTTNG_OK;
+end:
return ret;
}
* Return LTTNG_OK on success or a LTTNG_ERR code.
*/
static enum lttng_error_code set_relayd_for_snapshot(
- struct consumer_output *consumer,
- const struct snapshot_output *snap_output,
+ struct consumer_output *output,
const struct ltt_session *session)
{
enum lttng_error_code status = LTTNG_OK;
struct lttng_ht_iter iter;
struct consumer_socket *socket;
+ LTTNG_OPTIONAL(uint64_t) current_chunk_id = {};
- assert(consumer);
- assert(snap_output);
+ assert(output);
assert(session);
DBG2("Set relayd object from snapshot output");
+ if (session->current_trace_chunk) {
+ enum lttng_trace_chunk_status chunk_status =
+ lttng_trace_chunk_get_id(
+ session->current_trace_chunk,
+ ¤t_chunk_id.value);
+
+ if (chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK) {
+ current_chunk_id.is_set = true;
+ } else {
+ ERR("Failed to get current trace chunk id");
+ status = LTTNG_ERR_UNK;
+ goto error;
+ }
+ }
+
/* Ignore if snapshot consumer output is not network. */
- if (snap_output->consumer->type != CONSUMER_DST_NET) {
+ if (output->type != CONSUMER_DST_NET) {
goto error;
}
* snapshot output.
*/
rcu_read_lock();
- cds_lfht_for_each_entry(snap_output->consumer->socks->ht, &iter.iter,
+ cds_lfht_for_each_entry(output->socks->ht, &iter.iter,
socket, node.node) {
pthread_mutex_lock(socket->lock);
status = send_consumer_relayd_sockets(0, session->id,
- snap_output->consumer, socket,
+ output, socket,
session->name, session->hostname,
- session->live_timer);
+ session->live_timer,
+ current_chunk_id.is_set ? ¤t_chunk_id.value : NULL,
+ session->creation_time);
pthread_mutex_unlock(socket->lock);
if (status != LTTNG_OK) {
rcu_read_unlock();
*/
static enum lttng_error_code record_kernel_snapshot(
struct ltt_kernel_session *ksess,
- const struct snapshot_output *output,
+ const struct consumer_output *output,
const struct ltt_session *session,
int wait, uint64_t nb_packets_per_stream)
{
- int ret;
enum lttng_error_code status;
assert(ksess);
assert(output);
assert(session);
- /*
- * Copy kernel session sockets so we can communicate with the right
- * consumer for the snapshot record command.
- */
- ret = consumer_copy_sockets(output->consumer, ksess->consumer);
- if (ret < 0) {
- status = LTTNG_ERR_NOMEM;
- goto error;
- }
-
- status = set_relayd_for_snapshot(ksess->consumer, output, session);
- if (status != LTTNG_OK) {
- goto error_snapshot;
- }
-
- status = kernel_snapshot_record(ksess, output, wait, nb_packets_per_stream);
- if (status != LTTNG_OK) {
- goto error_snapshot;
- }
-
- goto end;
-
-error_snapshot:
- /* Clean up copied sockets so this output can use some other later on. */
- consumer_destroy_output_sockets(output->consumer);
-error:
-end:
+ status = kernel_snapshot_record(
+ ksess, output, wait, nb_packets_per_stream);
return status;
}
* Returns LTTNG_OK on success or a LTTNG_ERR error code.
*/
static enum lttng_error_code record_ust_snapshot(struct ltt_ust_session *usess,
- const struct snapshot_output *output,
- const struct ltt_session *session, int wait,
- uint64_t nb_packets_per_stream)
+ const struct consumer_output *output,
+ const struct ltt_session *session,
+ int wait, uint64_t nb_packets_per_stream)
{
- int ret;
enum lttng_error_code status;
assert(usess);
assert(output);
assert(session);
- /*
- * Copy UST session sockets so we can communicate with the right
- * consumer for the snapshot record command.
- */
- ret = consumer_copy_sockets(output->consumer, usess->consumer);
- if (ret < 0) {
- status = LTTNG_ERR_NOMEM;
- goto error;
- }
-
- status = set_relayd_for_snapshot(usess->consumer, output, session);
- if (status != LTTNG_OK) {
- goto error_snapshot;
- }
-
- status = ust_app_snapshot_record(usess, output, wait,
- nb_packets_per_stream);
- if (status != LTTNG_OK) {
- goto error_snapshot;
- }
-
- goto end;
-
-error_snapshot:
- /* Clean up copied sockets so this output can use some other later on. */
- consumer_destroy_output_sockets(output->consumer);
-error:
-end:
+ status = ust_app_snapshot_record(
+ usess, output, wait, nb_packets_per_stream);
return status;
}
}
static
-enum lttng_error_code snapshot_record(const struct ltt_session *session,
+enum lttng_error_code snapshot_record(struct ltt_session *session,
const struct snapshot_output *snapshot_output, int wait)
{
int64_t nb_packets_per_stream;
- enum lttng_error_code ret = LTTNG_OK;
+ char snapshot_chunk_name[LTTNG_NAME_MAX];
+ int ret;
+ enum lttng_error_code ret_code = LTTNG_OK;
+ struct lttng_trace_chunk *snapshot_trace_chunk;
+ struct consumer_output *original_ust_consumer_output = NULL;
+ struct consumer_output *original_kernel_consumer_output = NULL;
+ struct consumer_output *snapshot_ust_consumer_output = NULL;
+ struct consumer_output *snapshot_kernel_consumer_output = NULL;
+
+ ret = snprintf(snapshot_chunk_name, sizeof(snapshot_chunk_name),
+ "%s-%s-%" PRIu64,
+ snapshot_output->name,
+ snapshot_output->datetime,
+ snapshot_output->nb_snapshot);
+ if (ret < 0 || ret >= sizeof(snapshot_chunk_name)) {
+ ERR("Failed to format snapshot name");
+ ret_code = LTTNG_ERR_INVALID;
+ goto error;
+ }
+ DBG("Recording snapshot \"%s\" for session \"%s\" with chunk name \"%s\"",
+ snapshot_output->name, session->name,
+ snapshot_chunk_name);
+ if (!session->kernel_session && !session->ust_session) {
+ ERR("Failed to record snapshot as no channels exist");
+ ret_code = LTTNG_ERR_NO_CHANNEL;
+ goto error;
+ }
+
+ if (session->kernel_session) {
+ original_kernel_consumer_output =
+ session->kernel_session->consumer;
+ snapshot_kernel_consumer_output =
+ consumer_copy_output(snapshot_output->consumer);
+ ret = consumer_copy_sockets(snapshot_kernel_consumer_output,
+ original_kernel_consumer_output);
+ if (ret < 0) {
+ ERR("Failed to copy consumer sockets from snapshot output configuration");
+ ret_code = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ ret_code = set_relayd_for_snapshot(
+ snapshot_kernel_consumer_output, session);
+ if (ret_code != LTTNG_OK) {
+ ERR("Failed to setup relay daemon for kernel tracer snapshot");
+ goto error;
+ }
+ session->kernel_session->consumer =
+ snapshot_kernel_consumer_output;
+ }
+ if (session->ust_session) {
+ original_ust_consumer_output = session->ust_session->consumer;
+ snapshot_ust_consumer_output =
+ consumer_copy_output(snapshot_output->consumer);
+ ret = consumer_copy_sockets(snapshot_ust_consumer_output,
+ original_ust_consumer_output);
+ if (ret < 0) {
+ ERR("Failed to copy consumer sockets from snapshot output configuration");
+ ret_code = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+ ret_code = set_relayd_for_snapshot(
+ snapshot_ust_consumer_output, session);
+ if (ret_code != LTTNG_OK) {
+ ERR("Failed to setup relay daemon for userspace tracer snapshot");
+ goto error;
+ }
+ session->ust_session->consumer =
+ snapshot_ust_consumer_output;
+ }
+
+ snapshot_trace_chunk = session_create_new_trace_chunk(session,
+ snapshot_kernel_consumer_output ?:
+ snapshot_ust_consumer_output,
+ consumer_output_get_base_path(
+ snapshot_output->consumer),
+ snapshot_chunk_name);
+ if (!snapshot_trace_chunk) {
+ ERR("Failed to create temporary trace chunk to record a snapshot of session \"%s\"",
+ session->name);
+ ret_code = LTTNG_ERR_CREATE_DIR_FAIL;
+ goto error;
+ }
+ assert(!session->current_trace_chunk);
+ ret = session_set_trace_chunk(session, snapshot_trace_chunk, NULL);
+ lttng_trace_chunk_put(snapshot_trace_chunk);
+ snapshot_trace_chunk = NULL;
+ if (ret) {
+ ERR("Failed to set temporary trace chunk to record a snapshot of session \"%s\"",
+ session->name);
+ ret_code = LTTNG_ERR_CREATE_TRACE_CHUNK_FAIL_CONSUMER;
+ goto error;
+ }
nb_packets_per_stream = get_session_nb_packets_per_stream(session,
snapshot_output->max_size);
if (nb_packets_per_stream < 0) {
- ret = LTTNG_ERR_MAX_SIZE_INVALID;
- goto end;
+ ret_code = LTTNG_ERR_MAX_SIZE_INVALID;
+ goto error;
}
if (session->kernel_session) {
- ret = record_kernel_snapshot(session->kernel_session,
- snapshot_output, session,
+ ret_code = record_kernel_snapshot(session->kernel_session,
+ snapshot_kernel_consumer_output, session,
wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
- goto end;
+ if (ret_code != LTTNG_OK) {
+ goto error;
}
}
if (session->ust_session) {
- ret = record_ust_snapshot(session->ust_session,
- snapshot_output, session,
+ ret_code = record_ust_snapshot(session->ust_session,
+ snapshot_ust_consumer_output, session,
wait, nb_packets_per_stream);
- if (ret != LTTNG_OK) {
- goto end;
+ if (ret_code != LTTNG_OK) {
+ goto error;
}
}
-end:
- return ret;
+
+ if (session_close_trace_chunk(
+ session, session->current_trace_chunk, NULL)) {
+ /*
+ * Don't goto end; make sure the chunk is closed for the session
+ * to allow future snapshots.
+ */
+ ERR("Failed to close snapshot trace chunk of session \"%s\"",
+ session->name);
+ ret_code = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
+ }
+ if (session_set_trace_chunk(session, NULL, NULL)) {
+ ERR("Failed to release the current trace chunk of session \"%s\"",
+ session->name);
+ ret_code = LTTNG_ERR_UNK;
+ }
+error:
+ if (original_ust_consumer_output) {
+ session->ust_session->consumer = original_ust_consumer_output;
+ }
+ if (original_kernel_consumer_output) {
+ session->kernel_session->consumer =
+ original_kernel_consumer_output;
+ }
+ consumer_output_put(snapshot_ust_consumer_output);
+ consumer_output_put(snapshot_kernel_consumer_output);
+ return ret_code;
}
/*
{
enum lttng_error_code cmd_ret = LTTNG_OK;
int ret;
- unsigned int use_tmp_output = 0;
- struct snapshot_output tmp_output;
unsigned int snapshot_success = 0;
char datetime[16];
+ struct snapshot_output *tmp_output = NULL;
assert(session);
assert(output);
/* Use temporary output for the session. */
if (*output->ctrl_url != '\0') {
+ tmp_output = snapshot_output_alloc();
+ if (!tmp_output) {
+ cmd_ret = LTTNG_ERR_NOMEM;
+ goto error;
+ }
+
ret = snapshot_output_init(session, output->max_size,
output->name,
output->ctrl_url, output->data_url,
session->consumer,
- &tmp_output, NULL);
+ tmp_output, NULL);
if (ret < 0) {
if (ret == -ENOMEM) {
cmd_ret = LTTNG_ERR_NOMEM;
goto error;
}
/* Use the global session count for the temporary snapshot. */
- tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
+ tmp_output->nb_snapshot = session->snapshot.nb_snapshot;
/* Use the global datetime */
- memcpy(tmp_output.datetime, datetime, sizeof(datetime));
- use_tmp_output = 1;
- }
-
- if (use_tmp_output) {
- cmd_ret = snapshot_record(session, &tmp_output, wait);
+ memcpy(tmp_output->datetime, datetime, sizeof(datetime));
+ cmd_ret = snapshot_record(session, tmp_output, wait);
if (cmd_ret != LTTNG_OK) {
goto error;
}
rcu_read_lock();
cds_lfht_for_each_entry(session->snapshot.output_ht->ht,
&iter.iter, sout, node.node) {
+ struct snapshot_output output_copy;
+
/*
- * Make a local copy of the output and assign the
- * possible temporary value given by the caller.
+ * Make a local copy of the output and override output
+ * parameters with those provided as part of the
+ * command.
*/
- memcpy(&tmp_output, sout, sizeof(tmp_output));
+ memcpy(&output_copy, sout, sizeof(output_copy));
if (output->max_size != (uint64_t) -1ULL) {
- tmp_output.max_size = output->max_size;
+ output_copy.max_size = output->max_size;
}
- tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
- memcpy(tmp_output.datetime, datetime, sizeof(datetime));
+ output_copy.nb_snapshot = session->snapshot.nb_snapshot;
+ memcpy(output_copy.datetime, datetime,
+ sizeof(datetime));
/* Use temporary name. */
if (*output->name != '\0') {
- if (lttng_strncpy(tmp_output.name, output->name,
- sizeof(tmp_output.name))) {
+ if (lttng_strncpy(output_copy.name,
+ output->name,
+ sizeof(output_copy.name))) {
cmd_ret = LTTNG_ERR_INVALID;
rcu_read_unlock();
goto error;
}
}
- cmd_ret = snapshot_record(session, &tmp_output, wait);
+ cmd_ret = snapshot_record(session, &output_copy, wait);
if (cmd_ret != LTTNG_OK) {
rcu_read_unlock();
goto error;
}
error:
+ if (tmp_output) {
+ snapshot_output_destroy(tmp_output);
+ }
return cmd_ret;
}
struct lttng_rotate_session_return *rotate_return)
{
int ret;
+ uint64_t ongoing_rotation_chunk_id;
enum lttng_error_code cmd_ret = LTTNG_OK;
- size_t strf_ret;
- struct tm *timeinfo;
- char datetime[21];
- time_t now;
- /*
- * Used to roll-back timestamps in case of failure to launch the
- * rotation.
- */
- time_t original_last_chunk_start_ts, original_current_chunk_start_ts;
+ struct lttng_trace_chunk *chunk_being_archived = NULL;
+ struct lttng_trace_chunk *new_trace_chunk = NULL;
+ enum lttng_trace_chunk_status chunk_status;
assert(session);
goto end;
}
- /*
- * Unsupported feature in lttng-relayd before 2.11.
- */
+ /* Unsupported feature in lttng-relayd before 2.11. */
if (session->consumer->type == CONSUMER_DST_NET &&
(session->consumer->relay_major_version == 2 &&
session->consumer->relay_minor_version < 11)) {
goto end;
}
- /* Special case for the first rotation. */
- if (session->current_archive_id == 0) {
- const char *base_path = NULL;
-
- assert(session->kernel_session || session->ust_session);
- /* Either one of the two sessions is enough to get the root path. */
- base_path = session_get_base_path(session);
- assert(base_path);
+ session->rotation_state = LTTNG_ROTATION_STATE_ONGOING;
- ret = lttng_strncpy(session->rotation_chunk.current_rotate_path,
- base_path,
- sizeof(session->rotation_chunk.current_rotate_path));
- if (ret) {
- ERR("Failed to copy session base path to current rotation chunk path");
- cmd_ret = LTTNG_ERR_UNK;
- goto end;
- }
- } else {
- /*
- * The currently active tracing path is now the folder we
- * want to rotate.
- */
- ret = lttng_strncpy(session->rotation_chunk.current_rotate_path,
- session->rotation_chunk.active_tracing_path,
- sizeof(session->rotation_chunk.current_rotate_path));
- if (ret) {
- ERR("Failed to copy the active tracing path to the current rotate path");
- cmd_ret = LTTNG_ERR_UNK;
- goto end;
+ if (session->active) {
+ new_trace_chunk = session_create_new_trace_chunk(session, NULL,
+ NULL, NULL);
+ if (!new_trace_chunk) {
+ cmd_ret = LTTNG_ERR_CREATE_DIR_FAIL;
+ goto error;
}
- }
- DBG("Current rotate path %s", session->rotation_chunk.current_rotate_path);
-
- /*
- * Channels created after this point will belong to the next
- * archive id.
- */
- session->current_archive_id++;
-
- now = time(NULL);
- if (now == (time_t) -1) {
- cmd_ret = LTTNG_ERR_UNK;
- goto end;
- }
-
- /* Sample chunk bounds for roll-back in case of error. */
- original_last_chunk_start_ts = session->last_chunk_start_ts;
- original_current_chunk_start_ts = session->current_chunk_start_ts;
-
- session->last_chunk_start_ts = session->current_chunk_start_ts;
- session->current_chunk_start_ts = now;
+ }
- timeinfo = localtime(&now);
- if (!timeinfo) {
- PERROR("Failed to sample local time in rotate session command");
- cmd_ret = LTTNG_ERR_UNK;
- goto end;
- }
- strf_ret = strftime(datetime, sizeof(datetime), "%Y%m%dT%H%M%S%z",
- timeinfo);
- if (!strf_ret) {
- ERR("Failed to format local time timestamp in rotate session command");
- cmd_ret = LTTNG_ERR_UNK;
- goto end;
- }
-
- /* Current chunk directory, ex: 20170922-111754-42 */
- ret = snprintf(session->consumer->chunk_path,
- sizeof(session->consumer->chunk_path),
- "%s-%" PRIu64, datetime,
- session->current_archive_id + 1);
- if (ret < 0 || ret >= sizeof(session->consumer->chunk_path)) {
- ERR("Failed to format the new chunk's directory in rotate session command");
- cmd_ret = LTTNG_ERR_UNK;
- goto error;
- }
-
- /*
- * The active path for the next rotation/destroy.
- * Ex: ~/lttng-traces/auto-20170922-111748/20170922-111754-42
- */
- ret = snprintf(session->rotation_chunk.active_tracing_path,
- sizeof(session->rotation_chunk.active_tracing_path),
- "%s/%s",
- session_get_base_path(session),
- session->consumer->chunk_path);
- if (ret < 0 || ret >= sizeof(session->rotation_chunk.active_tracing_path)) {
- ERR("Failed to format active tracing path in rotate session command");
- cmd_ret = LTTNG_ERR_UNK;
+ /* The current trace chunk becomes the chunk being archived. */
+ ret = session_set_trace_chunk(session, new_trace_chunk,
+ &chunk_being_archived);
+ if (ret) {
+ cmd_ret = LTTNG_ERR_CREATE_TRACE_CHUNK_FAIL_CONSUMER;
goto error;
}
- /*
- * A rotation has a local step even if the destination is a relay
- * daemon; the buffers must be consumed by the consumer daemon.
- */
- session->rotation_pending_local = true;
- session->rotation_pending_relay =
- session_get_consumer_destination_type(session) == CONSUMER_DST_NET;
- session->rotation_state = LTTNG_ROTATION_STATE_ONGOING;
+ assert(chunk_being_archived);
+ chunk_status = lttng_trace_chunk_get_id(chunk_being_archived,
+ &ongoing_rotation_chunk_id);
+ assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
if (session->kernel_session) {
- ret = lttng_strncpy(
- session->kernel_session->consumer->chunk_path,
- session->consumer->chunk_path,
- sizeof(session->kernel_session->consumer->chunk_path));
- if (ret) {
- ERR("Failed to copy current chunk directory to kernel session");
- cmd_ret = LTTNG_ERR_UNK;
- goto error;
- }
- /*
- * Create the new chunk folder, before the rotation begins so we
- * don't race with the consumer/tracer activity.
- */
- ret = domain_mkdir(session->kernel_session->consumer, session,
- session->kernel_session->uid,
- session->kernel_session->gid);
- if (ret) {
- cmd_ret = LTTNG_ERR_CREATE_DIR_FAIL;
- goto error;
- }
cmd_ret = kernel_rotate_session(session);
if (cmd_ret != LTTNG_OK) {
goto error;
}
}
if (session->ust_session) {
- ret = lttng_strncpy(
- session->ust_session->consumer->chunk_path,
- session->consumer->chunk_path,
- sizeof(session->ust_session->consumer->chunk_path));
- if (ret) {
- ERR("Failed to copy current chunk directory to userspace session");
- cmd_ret = LTTNG_ERR_UNK;
- goto error;
- }
- ret = domain_mkdir(session->ust_session->consumer, session,
- session->ust_session->uid,
- session->ust_session->gid);
- if (ret) {
- cmd_ret = LTTNG_ERR_CREATE_DIR_FAIL;
- goto error;
- }
cmd_ret = ust_app_rotate_session(session);
if (cmd_ret != LTTNG_OK) {
goto error;
}
}
+ ret = session_close_trace_chunk(session, chunk_being_archived,
+ &((enum lttng_trace_chunk_command_type) {
+ LTTNG_TRACE_CHUNK_COMMAND_TYPE_MOVE_TO_COMPLETED}));
+ if (ret) {
+ cmd_ret = LTTNG_ERR_CLOSE_TRACE_CHUNK_FAIL_CONSUMER;
+ goto error;
+ }
+
ret = timer_session_rotation_pending_check_start(session,
DEFAULT_ROTATE_PENDING_TIMER);
if (ret) {
}
if (rotate_return) {
- rotate_return->rotation_id = session->current_archive_id;
+ rotate_return->rotation_id = ongoing_rotation_chunk_id;
}
+ session->chunk_being_archived = chunk_being_archived;
+ chunk_being_archived = NULL;
ret = notification_thread_command_session_rotation_ongoing(
notification_thread_handle,
session->name, session->uid, session->gid,
- session->current_archive_id - 1);
+ ongoing_rotation_chunk_id);
if (ret != LTTNG_OK) {
ERR("Failed to notify notification thread that a session rotation is ongoing for session %s",
session->name);
}
DBG("Cmd rotate session %s, archive_id %" PRIu64 " sent",
- session->name, session->current_archive_id - 1);
+ session->name, ongoing_rotation_chunk_id);
end:
+ lttng_trace_chunk_put(new_trace_chunk);
+ lttng_trace_chunk_put(chunk_being_archived);
ret = (cmd_ret == LTTNG_OK) ? cmd_ret : -((int) cmd_ret);
return ret;
error:
- session->last_chunk_start_ts = original_last_chunk_start_ts;
- session->current_archive_id = original_current_chunk_start_ts;
if (session_reset_rotation_state(session,
- LTTNG_ROTATION_STATE_NO_ROTATION)) {
+ LTTNG_ROTATION_STATE_ERROR)) {
ERR("Failed to reset rotation state of session \"%s\"",
session->name);
}
*
* Check if the session has finished its rotation.
*
- * Return 0 on success or else a LTTNG_ERR code.
+ * Return LTTNG_OK on success or else an LTTNG_ERR code.
*/
int cmd_rotate_get_info(struct ltt_session *session,
struct lttng_rotation_get_info_return *info_return,
uint64_t rotation_id)
{
- int ret;
-
- assert(session);
+ enum lttng_error_code cmd_ret = LTTNG_OK;
+ enum lttng_rotation_state rotation_state;
DBG("Cmd rotate_get_info session %s, rotation id %" PRIu64, session->name,
- session->current_archive_id);
+ session->most_recent_chunk_id.value);
- if (session->current_archive_id != rotation_id) {
- info_return->status = (int32_t) LTTNG_ROTATION_STATE_EXPIRED;
- ret = LTTNG_OK;
- goto end;
+ if (session->chunk_being_archived) {
+ enum lttng_trace_chunk_status chunk_status;
+ uint64_t chunk_id;
+
+ chunk_status = lttng_trace_chunk_get_id(
+ session->chunk_being_archived,
+ &chunk_id);
+ assert(chunk_status == LTTNG_TRACE_CHUNK_STATUS_OK);
+
+ rotation_state = rotation_id == chunk_id ?
+ LTTNG_ROTATION_STATE_ONGOING :
+ LTTNG_ROTATION_STATE_EXPIRED;
+ } else {
+ if (session->last_archived_chunk_id.is_set &&
+ rotation_id != session->last_archived_chunk_id.value) {
+ rotation_state = LTTNG_ROTATION_STATE_EXPIRED;
+ } else {
+ rotation_state = session->rotation_state;
+ }
}
- switch (session->rotation_state) {
+ switch (rotation_state) {
+ case LTTNG_ROTATION_STATE_NO_ROTATION:
+ DBG("Reporting that no rotation has occured within the lifetime of session \"%s\"",
+ session->name);
+ goto end;
+ case LTTNG_ROTATION_STATE_EXPIRED:
+ DBG("Reporting that the rotation state of rotation id %" PRIu64 " of session \"%s\" has expired",
+ rotation_id, session->name);
+ break;
case LTTNG_ROTATION_STATE_ONGOING:
- DBG("Reporting that rotation id %" PRIu64 " of session %s is still pending",
+ DBG("Reporting that rotation id %" PRIu64 " of session \"%s\" is still pending",
rotation_id, session->name);
break;
case LTTNG_ROTATION_STATE_COMPLETED:
{
+ int fmt_ret;
+ char *chunk_path;
char *current_tracing_path_reply;
size_t current_tracing_path_reply_len;
+ DBG("Reporting that rotation id %" PRIu64 " of session \"%s\" is completed",
+ rotation_id, session->name);
+
switch (session_get_consumer_destination_type(session)) {
case CONSUMER_DST_LOCAL:
current_tracing_path_reply =
info_return->location.relay.protocol =
(int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP;
- ret = lttng_strncpy(info_return->location.relay.host,
+ fmt_ret = lttng_strncpy(info_return->location.relay.host,
session_get_net_consumer_hostname(session),
sizeof(info_return->location.relay.host));
- if (ret) {
- ERR("Failed to host name to rotate_get_info reply");
+ if (fmt_ret) {
+ ERR("Failed to copy host name to rotate_get_info reply");
info_return->status = LTTNG_ROTATION_STATUS_ERROR;
- ret = -LTTNG_ERR_UNK;
+ cmd_ret = LTTNG_ERR_SET_URL;
goto end;
}
default:
abort();
}
- ret = lttng_strncpy(current_tracing_path_reply,
- session->rotation_chunk.current_rotate_path,
- current_tracing_path_reply_len);
- if (ret) {
- ERR("Failed to copy current tracing path to rotate_get_info reply");
+ fmt_ret = asprintf(&chunk_path,
+ "%s/" DEFAULT_ARCHIVED_TRACE_CHUNKS_DIRECTORY "/%s",
+ session_get_base_path(session),
+ session->last_archived_chunk_name);
+ if (fmt_ret == -1) {
+ PERROR("Failed to format the path of the last archived trace chunk");
info_return->status = LTTNG_ROTATION_STATUS_ERROR;
- ret = -LTTNG_ERR_UNK;
+ cmd_ret = LTTNG_ERR_UNK;
+ goto end;
+ }
+
+ fmt_ret = lttng_strncpy(current_tracing_path_reply,
+ chunk_path, current_tracing_path_reply_len);
+ free(chunk_path);
+ if (fmt_ret) {
+ ERR("Failed to copy path of the last archived trace chunk to rotate_get_info reply");
+ info_return->status = LTTNG_ROTATION_STATUS_ERROR;
+ cmd_ret = LTTNG_ERR_UNK;
goto end;
}
break;
}
case LTTNG_ROTATION_STATE_ERROR:
- DBG("Reporting that an error occurred during rotation %" PRIu64 " of session %s",
+ DBG("Reporting that an error occurred during rotation %" PRIu64 " of session \"%s\"",
rotation_id, session->name);
break;
default:
abort();
}
- info_return->status = (int32_t) session->rotation_state;
- ret = LTTNG_OK;
+ cmd_ret = LTTNG_OK;
end:
- return ret;
+ info_return->status = (int32_t) rotation_state;
+ return cmd_ret;
}
/*