*/
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:
* 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;
}
*/
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;
}
* 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)
+ struct lttng_consumer_local_data *ctx,
+ uint64_t trace_archive_id)
{
int ret = 0;
struct lttng_consumer_channel *metadata_channel;
* 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;
}
* 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)
+ uint64_t nb_packets_per_stream,
+ struct lttng_consumer_local_data *ctx)
{
int ret;
unsigned use_relayd = 0;
health_code_update();
- ret = ask_channel(ctx, channel, &attr);
+ ret = ask_channel(ctx, channel, &attr,
+ msg.u.ask_channel.trace_archive_id);
if (ret < 0) {
goto end_channel_error;
}
ret = snapshot_metadata(msg.u.snapshot_channel.key,
msg.u.snapshot_channel.pathname,
msg.u.snapshot_channel.relayd_id,
- ctx);
+ ctx,
+ msg.u.snapshot_channel.trace_archive_id);
if (ret < 0) {
ERR("Snapshot metadata failed");
ret_code = LTTCOMM_CONSUMERD_ERROR_METADATA;
}
case LTTNG_CONSUMER_ROTATE_PENDING_RELAY:
{
- uint32_t pending;
+ int pending;
+ uint32_t pending_reply;
DBG("Consumer rotate pending on relay for session %" PRIu64,
msg.u.rotate_pending_relay.session_id);
if (pending < 0) {
ERR("Rotate pending relay failed");
ret_code = LTTCOMM_CONSUMERD_RELAYD_FAIL;
+ } else {
+ pending_reply = !!pending;
}
health_code_update();
+ /* Send whether the command was successful. */
ret = consumer_send_status_msg(sock, ret_code);
if (ret < 0) {
/* Somehow, the session daemon is not responding anymore. */
goto end_nosignal;
}
- /* Send back returned value to session daemon */
- ret = lttcomm_send_unix_sock(sock, &pending, sizeof(pending));
+ if (pending < 0) {
+ /*
+ * An error occured while running the command;
+ * don't send the 'pending' reply as the sessiond
+ * will not read it.
+ */
+ break;
+ }
+
+ /* Send back the command's payload (pending reply). */
+ ret = lttcomm_send_unix_sock(sock, &pending_reply,
+ sizeof(pending_reply));
if (ret < 0) {
PERROR("send data pending ret code");
goto error_fatal;