*
* Returns 0 on success, < 0 on error
*/
-int lttng_kconsumer_snapshot_metadata(uint64_t key, char *path,
+static int lttng_kconsumer_snapshot_metadata(uint64_t key, char *path,
uint64_t relayd_id, struct lttng_consumer_local_data *ctx)
{
int ret, use_relayd = 0;
if (!metadata_channel) {
ERR("Kernel snapshot metadata not found for key %" PRIu64, key);
ret = -1;
- goto error;
+ goto error_no_channel;
}
metadata_stream = metadata_channel->metadata_stream;
assert(metadata_stream);
+ pthread_mutex_lock(&metadata_stream->lock);
/* Flag once that we have a valid relayd for the stream. */
if (relayd_id != (uint64_t) -1ULL) {
if (use_relayd) {
ret = consumer_send_relayd_stream(metadata_stream, path);
if (ret < 0) {
- goto error;
+ goto error_snapshot;
}
} else {
ret = utils_create_stream_file(path, metadata_stream->name,
metadata_stream->tracefile_count_current,
metadata_stream->uid, metadata_stream->gid, NULL);
if (ret < 0) {
- goto error;
+ goto error_snapshot;
}
metadata_stream->out_fd = ret;
}
if (ret_read != -EAGAIN) {
ERR("Kernel snapshot reading metadata subbuffer (ret: %zd)",
ret_read);
- goto error;
+ ret = ret_read;
+ goto error_snapshot;
}
/* ret_read is negative at this point so we will exit the loop. */
continue;
}
ret = 0;
-
+error_snapshot:
+ pthread_mutex_unlock(&metadata_stream->lock);
cds_list_del(&metadata_stream->send_node);
consumer_stream_destroy(metadata_stream, NULL);
metadata_channel->metadata_stream = NULL;
-error:
+error_no_channel:
rcu_read_unlock();
return ret;
}
}
break;
}
- case LTTNG_CONSUMER_SET_CHANNEL_ROTATE_PIPE:
- {
- int channel_rotate_pipe;
- int flags;
-
- ret_code = LTTCOMM_CONSUMERD_SUCCESS;
- /* Successfully received the command's type. */
- ret = consumer_send_status_msg(sock, ret_code);
- if (ret < 0) {
- goto error_fatal;
- }
-
- ret = lttcomm_recv_fds_unix_sock(sock, &channel_rotate_pipe, 1);
- if (ret != (ssize_t) sizeof(channel_rotate_pipe)) {
- ERR("Failed to receive channel rotate pipe");
- goto error_fatal;
- }
-
- DBG("Received channel rotate pipe (%d)", channel_rotate_pipe);
- ctx->channel_rotate_pipe = channel_rotate_pipe;
- /* Set the pipe as non-blocking. */
- ret = fcntl(channel_rotate_pipe, F_GETFL, 0);
- if (ret == -1) {
- PERROR("fcntl get flags of the channel rotate pipe");
- goto error_fatal;
- }
- flags = ret;
-
- ret = fcntl(channel_rotate_pipe, F_SETFL, flags | O_NONBLOCK);
- if (ret == -1) {
- PERROR("fcntl set O_NONBLOCK flag of the channel rotate pipe");
- goto error_fatal;
- }
- DBG("Channel rotate pipe set as non-blocking");
- ret_code = LTTCOMM_CONSUMERD_SUCCESS;
- ret = consumer_send_status_msg(sock, ret_code);
- if (ret < 0) {
- goto error_fatal;
- }
- break;
- }
case LTTNG_CONSUMER_ROTATE_CHANNEL:
{
DBG("Consumer rotate channel %" PRIu64, msg.u.rotate_channel.key);
msg.u.rotate_channel.key, ctx);
if (ret < 0) {
ERR("Rotate ready streams failed");
- ret_code = LTTCOMM_CONSUMERD_CHAN_NOT_FOUND;
}
break;
}
break;
}
- case LTTNG_CONSUMER_ROTATE_PENDING_RELAY:
+ case LTTNG_CONSUMER_CHECK_ROTATION_PENDING_LOCAL:
{
+ int pending;
uint32_t pending_reply;
- DBG("Consumer rotate pending on relay for session %" PRIu64,
- msg.u.rotate_pending_relay.session_id);
- ret = lttng_consumer_rotate_pending_relay(
- msg.u.rotate_pending_relay.session_id,
- msg.u.rotate_pending_relay.relayd_id,
- msg.u.rotate_pending_relay.chunk_id);
+ 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_CHAN_NOT_FOUND;
+ } 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 occured 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) {
- ERR("Rotate pending relay failed");
+ 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_CHAN_NOT_FOUND;
} else {
- pending_reply = !!ret;
+ pending_reply = !!pending;
}
health_code_update();
goto end_nosignal;
}
+ if (pending < 0) {
+ /*
+ * An error occured 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("send data pending ret code");
+ PERROR("Failed to send rotation pending return code");
goto error_fatal;
}
break;
projects / lttng-tools.git / blobdiff