From 001b7e62c1cb15f9d6cb835647b81028d56cf2d8 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 11 May 2017 16:00:56 -0400 Subject: [PATCH] Fix: lttng-consumerd: cpu hotplug: send "streams_sent" command MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When creating a new channel, the streams being sent to the relayd are kept invisible to the live client until the "streams_sent" command is received. This ensures the client does not see a partial stream set. This "streams_sent" command needs to be sent on CPU hotplug too, otherwise the live client handling within relayd is not aware of those streams (they are never published). Signed-off-by: Mathieu Desnoyers Signed-off-by: Jérémie Galarneau --- src/common/consumer/consumer.h | 2 ++ src/common/kernel-consumer/kernel-consumer.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/common/consumer/consumer.h b/src/common/consumer/consumer.h index 6a38e50e5..7375373c7 100644 --- a/src/common/consumer/consumer.h +++ b/src/common/consumer/consumer.h @@ -224,6 +224,8 @@ struct lttng_consumer_channel { uint64_t discarded_events; /* Total number of missed packets due to overwriting (overwrite). */ uint64_t lost_packets; + + bool streams_sent_to_relayd; }; /* diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c index 3554b8f05..c7c141310 100644 --- a/src/common/kernel-consumer/kernel-consumer.c +++ b/src/common/kernel-consumer/kernel-consumer.c @@ -196,6 +196,7 @@ int lttng_kconsumer_snapshot_channel(uint64_t key, char *path, ERR("sending streams sent to relayd"); goto end_unlock; } + channel->streams_sent_to_relayd = true; } ret = kernctl_buffer_flush(stream->wait_fd); @@ -741,6 +742,19 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, consumer_stream_free(new_stream); goto end_nosignal; } + + /* + * If adding an extra stream to an already + * existing channel (e.g. cpu hotplug), we need + * to send the "streams_sent" command to relayd. + */ + if (channel->streams_sent_to_relayd) { + ret = consumer_send_relayd_streams_sent( + new_stream->net_seq_idx); + if (ret < 0) { + goto end_nosignal; + } + } } /* Get the right pipe where the stream will be sent. */ @@ -834,6 +848,7 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx, if (ret < 0) { goto end_nosignal; } + channel->streams_sent_to_relayd = true; } break; } -- 2.34.1