#include <unistd.h>
#include <urcu/list.h>
#include <signal.h>
+#include <stdbool.h>
#include <bin/lttng-consumerd/health-consumerd.h>
#include <common/common.h>
*/
static struct lttng_consumer_stream *allocate_stream(int cpu, int key,
struct lttng_consumer_channel *channel,
- struct lttng_consumer_local_data *ctx, int *_alloc_ret)
+ struct lttng_consumer_local_data *ctx, int *_alloc_ret,
+ uint64_t trace_archive_id)
{
int alloc_ret;
struct lttng_consumer_stream *stream = NULL;
cpu,
&alloc_ret,
channel->type,
- channel->monitor);
+ channel->monitor,
+ trace_archive_id);
if (stream == NULL) {
switch (alloc_ret) {
case -ENOENT:
goto error;
}
+ consumer_stream_update_channel_attributes(stream, channel);
stream->chan = channel;
error:
* Return 0 on success else a negative value.
*/
static int create_ust_streams(struct lttng_consumer_channel *channel,
- struct lttng_consumer_local_data *ctx)
+ struct lttng_consumer_local_data *ctx,
+ uint64_t trace_archive_id)
{
int ret, cpu = 0;
struct ustctl_consumer_stream *ustream;
}
/* Allocate consumer stream object. */
- stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret);
+ stream = allocate_stream(cpu, wait_fd, channel, ctx, &ret,
+ trace_archive_id);
if (!stream) {
goto error_alloc;
}
return -1;
}
-static int open_ust_stream_fd(struct lttng_consumer_channel *channel,
- struct ustctl_consumer_channel_attr *attr,
- int cpu)
+static int open_ust_stream_fd(struct lttng_consumer_channel *channel, int cpu)
{
char shm_path[PATH_MAX];
int ret;
goto error_alloc;
}
for (i = 0; i < nr_stream_fds; i++) {
- stream_fds[i] = open_ust_stream_fd(channel, attr, i);
+ stream_fds[i] = open_ust_stream_fd(channel, i);
if (stream_fds[i] < 0) {
ret = -1;
goto error_open;
}
/*
- * Send channel to sessiond.
+ * Send channel to sessiond and relayd if applicable.
*
* Return 0 on success or else a negative value.
*/
-static int send_sessiond_channel(int sock,
+static int send_channel_to_sessiond_and_relayd(int sock,
struct lttng_consumer_channel *channel,
struct lttng_consumer_local_data *ctx, int *relayd_error)
{
health_code_update();
/* Try to send the stream to the relayd if one is available. */
+ DBG("Sending stream %" PRIu64 " of channel \"%s\" to relayd",
+ stream->key, channel->name);
ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
if (ret < 0) {
/*
* Return 0 on success or else, a negative value is returned and the channel
* MUST be destroyed by consumer_del_channel().
*/
-static int ask_channel(struct lttng_consumer_local_data *ctx, int sock,
+static int ask_channel(struct lttng_consumer_local_data *ctx,
struct lttng_consumer_channel *channel,
- struct ustctl_consumer_channel_attr *attr)
+ struct ustctl_consumer_channel_attr *attr,
+ uint64_t trace_archive_id)
{
int ret;
}
/* Open all streams for this channel. */
- ret = create_ust_streams(channel, ctx);
+ ret = create_ust_streams(channel, ctx, trace_archive_id);
if (ret < 0) {
goto end;
}
/*
* Snapshot the whole metadata.
+ * RCU read-side lock must be held across this function to ensure existence of
+ * metadata_channel.
*
* Returns 0 on success, < 0 on error
*/
-static int snapshot_metadata(uint64_t key, char *path, uint64_t relayd_id,
- struct lttng_consumer_local_data *ctx)
+static int snapshot_metadata(struct lttng_consumer_channel *metadata_channel,
+ uint64_t key, char *path, uint64_t relayd_id,
+ struct lttng_consumer_local_data *ctx,
+ uint64_t trace_archive_id)
{
int ret = 0;
- struct lttng_consumer_channel *metadata_channel;
struct lttng_consumer_stream *metadata_stream;
assert(path);
rcu_read_lock();
- metadata_channel = consumer_find_channel(key);
- if (!metadata_channel) {
- ERR("UST snapshot metadata channel not found for key %" PRIu64,
- key);
- ret = -1;
- goto error;
- }
assert(!metadata_channel->monitor);
health_code_update();
* The metadata stream is NOT created in no monitor mode when the channel
* is created on a sessiond ask channel command.
*/
- ret = create_ust_streams(metadata_channel, ctx);
+ ret = create_ust_streams(metadata_channel, ctx, trace_archive_id);
if (ret < 0) {
goto error;
}
/*
* Take a snapshot of all the stream of a channel.
+ * RCU read-side lock must be held across this function to ensure existence of
+ * channel.
*
* Returns 0 on success, < 0 on error
*/
-static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
- uint64_t nb_packets_per_stream, struct lttng_consumer_local_data *ctx)
+static int snapshot_channel(struct lttng_consumer_channel *channel,
+ uint64_t key, char *path, uint64_t relayd_id,
+ uint64_t nb_packets_per_stream,
+ struct lttng_consumer_local_data *ctx)
{
int ret;
unsigned use_relayd = 0;
unsigned long consumed_pos, produced_pos;
- struct lttng_consumer_channel *channel;
struct lttng_consumer_stream *stream;
assert(path);
use_relayd = 1;
}
- channel = consumer_find_channel(key);
- if (!channel) {
- ERR("UST snapshot channel not found for key %" PRIu64, key);
- ret = -1;
- goto error;
- }
assert(!channel->monitor);
DBG("UST consumer snapshot channel %" PRIu64, key);
produced_pos, nb_packets_per_stream,
stream->max_sb_size);
- while (consumed_pos < produced_pos) {
+ while ((long) (consumed_pos - produced_pos) < 0) {
ssize_t read_len;
unsigned long len, padded_len;
consumer_stream_close(stream);
error_unlock:
pthread_mutex_unlock(&stream->lock);
-error:
rcu_read_unlock();
return ret;
}
health_code_update();
- ret = ask_channel(ctx, sock, channel, &attr);
+ ret = ask_channel(ctx, channel, &attr,
+ msg.u.ask_channel.trace_archive_id);
if (ret < 0) {
goto end_channel_error;
}
health_code_update();
- /* Send everything to sessiond. */
- ret = send_sessiond_channel(sock, channel, ctx, &relayd_err);
+ /* Send the channel to sessiond (and relayd, if applicable). */
+ ret = send_channel_to_sessiond_and_relayd(sock, channel, ctx,
+ &relayd_err);
if (ret < 0) {
if (relayd_err) {
/*
}
case LTTNG_CONSUMER_SNAPSHOT_CHANNEL:
{
- if (msg.u.snapshot_channel.metadata) {
- ret = snapshot_metadata(msg.u.snapshot_channel.key,
- msg.u.snapshot_channel.pathname,
- msg.u.snapshot_channel.relayd_id,
- ctx);
- if (ret < 0) {
- ERR("Snapshot metadata failed");
- ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
- }
+ struct lttng_consumer_channel *channel;
+ uint64_t key = msg.u.snapshot_channel.key;
+
+ channel = consumer_find_channel(key);
+ if (!channel) {
+ DBG("UST snapshot channel not found for key %" PRIu64, key);
+ ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
} else {
- ret = snapshot_channel(msg.u.snapshot_channel.key,
- msg.u.snapshot_channel.pathname,
- msg.u.snapshot_channel.relayd_id,
- msg.u.snapshot_channel.nb_packets_per_stream,
- ctx);
- if (ret < 0) {
- ERR("Snapshot channel failed");
- ret_code = LTTCOMM_CONSUMERD_CHANNEL_FAIL;
+ if (msg.u.snapshot_channel.metadata) {
+ ret = snapshot_metadata(channel, key,
+ msg.u.snapshot_channel.pathname,
+ msg.u.snapshot_channel.relayd_id,
+ ctx,
+ msg.u.snapshot_channel.trace_archive_id);
+ if (ret < 0) {
+ ERR("Snapshot metadata failed");
+ ret_code = LTTCOMM_CONSUMERD_SNAPSHOT_FAILED;
+ }
+ } else {
+ ret = snapshot_channel(channel, key,
+ msg.u.snapshot_channel.pathname,
+ msg.u.snapshot_channel.relayd_id,
+ msg.u.snapshot_channel.nb_packets_per_stream,
+ ctx);
+ if (ret < 0) {
+ ERR("Snapshot channel failed");
+ ret_code = LTTCOMM_CONSUMERD_SNAPSHOT_FAILED;
+ }
}
}
-
health_code_update();
ret = consumer_send_status_msg(sock, ret_code);
if (ret < 0) {
}
goto end_msg_sessiond;
}
+ case LTTNG_CONSUMER_ROTATE_CHANNEL:
+ {
+ struct lttng_consumer_channel *channel;
+ uint64_t key = msg.u.rotate_channel.key;
+
+ channel = consumer_find_channel(key);
+ if (!channel) {
+ DBG("Channel %" PRIu64 " not found", key);
+ ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+ } else {
+ /*
+ * Sample the rotate position of all the streams in
+ * this channel.
+ */
+ ret = lttng_consumer_rotate_channel(channel, key,
+ msg.u.rotate_channel.pathname,
+ msg.u.rotate_channel.relayd_id,
+ msg.u.rotate_channel.metadata,
+ msg.u.rotate_channel.new_chunk_id,
+ ctx);
+ if (ret < 0) {
+ ERR("Rotate channel failed");
+ ret_code = LTTCOMM_CONSUMERD_ROTATION_FAIL;
+ }
+
+ health_code_update();
+ }
+ ret = consumer_send_status_msg(sock, ret_code);
+ if (ret < 0) {
+ /* Somehow, the session daemon is not responding anymore. */
+ goto end_nosignal;
+ }
+
+ /*
+ * Rotate the streams that are ready right now.
+ * FIXME: this is a second consecutive iteration over the
+ * streams in a channel, there is probably a better way to
+ * handle this, but it needs to be after the
+ * consumer_send_status_msg() call.
+ */
+ if (channel) {
+ ret = lttng_consumer_rotate_ready_streams(
+ channel, key, ctx);
+ if (ret < 0) {
+ ERR("Rotate channel failed");
+ }
+ }
+ break;
+ }
+ case LTTNG_CONSUMER_ROTATE_RENAME:
+ {
+ DBG("Consumer rename session %" PRIu64 " after rotation",
+ msg.u.rotate_rename.session_id);
+ ret = lttng_consumer_rotate_rename(msg.u.rotate_rename.old_path,
+ msg.u.rotate_rename.new_path,
+ msg.u.rotate_rename.uid,
+ msg.u.rotate_rename.gid,
+ msg.u.rotate_rename.relayd_id);
+ if (ret < 0) {
+ ERR("Rotate rename failed");
+ ret_code = LTTCOMM_CONSUMERD_ROTATE_RENAME_FAILED;
+ }
+
+ health_code_update();
+
+ ret = consumer_send_status_msg(sock, ret_code);
+ if (ret < 0) {
+ /* Somehow, the session daemon is not responding anymore. */
+ goto end_nosignal;
+ }
+ break;
+ }
+ case LTTNG_CONSUMER_CHECK_ROTATION_PENDING_LOCAL:
+ {
+ int pending;
+ uint32_t pending_reply;
+
+ DBG("Perform local check of pending rotation for session id %" PRIu64,
+ msg.u.check_rotation_pending_local.session_id);
+ pending = lttng_consumer_check_rotation_pending_local(
+ msg.u.check_rotation_pending_local.session_id,
+ msg.u.check_rotation_pending_local.chunk_id);
+ if (pending < 0) {
+ ERR("Local rotation pending check failed with code %i", pending);
+ ret_code = LTTCOMM_CONSUMERD_ROTATION_PENDING_LOCAL_FAILED;
+ } else {
+ pending_reply = !!pending;
+ }
+
+ health_code_update();
+
+ ret = consumer_send_status_msg(sock, ret_code);
+ if (ret < 0) {
+ /* Somehow, the session daemon is not responding anymore. */
+ goto end_nosignal;
+ }
+
+ if (pending < 0) {
+ /*
+ * An error occurred while running the command;
+ * don't send the 'pending' flag as the sessiond
+ * will not read it.
+ */
+ break;
+ }
+
+ /* Send back returned value to session daemon */
+ ret = lttcomm_send_unix_sock(sock, &pending_reply,
+ sizeof(pending_reply));
+ if (ret < 0) {
+ PERROR("Failed to send rotation pending return code");
+ goto error_fatal;
+ }
+ break;
+ }
+ case LTTNG_CONSUMER_CHECK_ROTATION_PENDING_RELAY:
+ {
+ int pending;
+ uint32_t pending_reply;
+
+ DBG("Perform relayd check of pending rotation for session id %" PRIu64,
+ msg.u.check_rotation_pending_relay.session_id);
+ pending = lttng_consumer_check_rotation_pending_relay(
+ msg.u.check_rotation_pending_relay.session_id,
+ msg.u.check_rotation_pending_relay.relayd_id,
+ msg.u.check_rotation_pending_relay.chunk_id);
+ if (pending < 0) {
+ ERR("Relayd rotation pending check failed with code %i", pending);
+ ret_code = LTTCOMM_CONSUMERD_ROTATION_PENDING_RELAY_FAILED;
+ } else {
+ pending_reply = !!pending;
+ }
+
+ health_code_update();
+
+ ret = consumer_send_status_msg(sock, ret_code);
+ if (ret < 0) {
+ /* Somehow, the session daemon is not responding anymore. */
+ goto end_nosignal;
+ }
+
+ if (pending < 0) {
+ /*
+ * An error occurred while running the command;
+ * don't send the 'pending' flag as the sessiond
+ * will not read it.
+ */
+ break;
+ }
+
+ /* Send back returned value to session daemon */
+ ret = lttcomm_send_unix_sock(sock, &pending_reply,
+ sizeof(pending_reply));
+ if (ret < 0) {
+ PERROR("Failed to send rotation pending return code");
+ goto error_fatal;
+ }
+ break;
+ }
case LTTNG_CONSUMER_MKDIR:
{
DBG("Consumer mkdir %s in session %" PRIu64,
msg.u.mkdir.relayd_id);
if (ret < 0) {
ERR("consumer mkdir failed");
- ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
+ ret_code = LTTCOMM_CONSUMERD_MKDIR_FAILED;
}
health_code_update();
return ustctl_get_mmap_base(stream->ustream);
}
+void lttng_ustctl_flush_buffer(struct lttng_consumer_stream *stream,
+ int producer_active)
+{
+ assert(stream);
+ assert(stream->ustream);
+
+ ustctl_flush_buffer(stream->ustream, producer_active);
+}
+
/*
* Take a snapshot for a specific stream.
*
* Return 0 on success else a negative value.
*/
int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
- struct lttng_consumer_local_data *ctx)
+ struct lttng_consumer_local_data *ctx, bool *rotated)
{
unsigned long len, subbuf_size, padding;
- int err, write_index = 1;
+ int err, write_index = 1, rotation_ret;
long ret = 0;
struct ustctl_consumer_stream *ustream;
struct ctf_packet_index index;
readlen = lttng_read(stream->wait_fd, &dummy, 1);
if (readlen < 0 && errno != EAGAIN && errno != EWOULDBLOCK) {
ret = readlen;
- goto end;
+ goto error;
+ }
+ }
+
+ /*
+ * If the stream was flagged to be ready for rotation before we extract the
+ * next packet, rotate it now.
+ */
+ if (stream->rotate_ready) {
+ DBG("Rotate stream before extracting data");
+ rotation_ret = lttng_consumer_rotate_stream(ctx, stream, rotated);
+ if (rotation_ret < 0) {
+ ERR("Stream rotation error");
+ ret = -1;
+ goto error;
}
}
if (stream->metadata_flag) {
ret = commit_one_metadata_packet(stream);
if (ret <= 0) {
- goto end;
+ goto error;
}
ustctl_flush_buffer(stream->ustream, 1);
goto retry;
*/
DBG("Reserving sub buffer failed (everything is normal, "
"it is due to concurrency) [ret: %d]", err);
- goto end;
+ goto error;
}
assert(stream->chan->output == CONSUMER_CHANNEL_MMAP);
if (ret < 0) {
err = ustctl_put_subbuf(ustream);
assert(err == 0);
- goto end;
+ goto error;
}
/* Update the stream's sequence and discarded events count. */
PERROR("kernctl_get_events_discarded");
err = ustctl_put_subbuf(ustream);
assert(err == 0);
- goto end;
+ goto error;
}
} else {
write_index = 0;
assert(len >= subbuf_size);
padding = len - subbuf_size;
+
/* write the subbuffer to the tracefile */
ret = lttng_consumer_on_read_subbuffer_mmap(ctx, stream, subbuf_size, padding, &index);
/*
if (!stream->metadata_flag) {
ret = notify_if_more_data(stream, ctx);
if (ret < 0) {
- goto end;
+ goto error;
}
}
/* Write index if needed. */
if (!write_index) {
- goto end;
+ goto rotate;
}
if (stream->chan->live_timer_interval && !stream->metadata_flag) {
}
if (err < 0) {
- goto end;
+ goto error;
}
}
assert(!stream->metadata_flag);
err = consumer_stream_write_index(stream, &index);
if (err < 0) {
- goto end;
+ goto error;
}
-end:
+rotate:
+ /*
+ * After extracting the packet, we check if the stream is now ready to be
+ * rotated and perform the action immediately.
+ */
+ rotation_ret = lttng_consumer_stream_is_rotate_ready(stream);
+ if (rotation_ret == 1) {
+ rotation_ret = lttng_consumer_rotate_stream(ctx, stream, rotated);
+ if (rotation_ret < 0) {
+ ERR("Stream rotation error");
+ ret = -1;
+ goto error;
+ }
+ } else if (rotation_ret < 0) {
+ ERR("Checking if stream is ready to rotate");
+ ret = -1;
+ goto error;
+ }
+error:
return ret;
}
request.key = channel->key;
DBG("Sending metadata request to sessiond, session id %" PRIu64
- ", per-pid %" PRIu64 ", app UID %u and channek key %" PRIu64,
+ ", per-pid %" PRIu64 ", app UID %u and channel key %" PRIu64,
request.session_id, request.session_id_per_pid, request.uid,
request.key);