X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=bdabb5e49fcda0e44d6c65018efc0b4f296c6730;hb=601262d65a9ccd90198558639ef2a73cda4230e1;hp=79d8fd7a5012373164bbadfe420537fa1e418af5;hpb=0c759fc95033a3d6d7cb939f39dd643ce7e127ee;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 79d8fd7a5..bdabb5e49 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -409,6 +409,7 @@ static int send_sessiond_channel(int sock,
 {
 	int ret, ret_code = LTTCOMM_CONSUMERD_SUCCESS;
 	struct lttng_consumer_stream *stream;
+	uint64_t net_seq_idx = -1ULL;
 
 	assert(channel);
 	assert(ctx);
@@ -433,6 +434,9 @@ static int send_sessiond_channel(int sock,
 				}
 				ret_code = LTTNG_ERR_RELAYD_CONNECT_FAIL;
 			}
+			if (net_seq_idx == -1ULL) {
+				net_seq_idx = stream->net_seq_idx;
+			}
 		}
 	}
 
@@ -754,6 +758,12 @@ static int setup_metadata(struct lttng_consumer_local_data *ctx, uint64_t key)
 			ret = LTTCOMM_CONSUMERD_ERROR_METADATA;
 			goto error;
 		}
+		ret = consumer_send_relayd_streams_sent(
+				metadata->metadata_stream->net_seq_idx);
+		if (ret < 0) {
+			ret = LTTCOMM_CONSUMERD_RELAYD_FAIL;
+			goto error;
+		}
 	}
 
 	ret = send_streams_to_thread(metadata, ctx);
@@ -939,6 +949,12 @@ static int snapshot_channel(uint64_t key, char *path, uint64_t relayd_id,
 			DBG("UST consumer snapshot stream %s/%s (%" PRIu64 ")", path,
 					stream->name, stream->key);
 		}
+		if (relayd_id != -1ULL) {
+			ret = consumer_send_relayd_streams_sent(relayd_id);
+			if (ret < 0) {
+				goto error_unlock;
+			}
+		}
 
 		ustctl_flush_buffer(stream->ustream, 1);
 
@@ -1451,8 +1467,15 @@ int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 
 		channel = consumer_find_channel(key);
 		if (!channel) {
-			ERR("UST consumer push metadata %" PRIu64 " not found", key);
-			ret_code = LTTNG_ERR_UST_CHAN_NOT_FOUND;
+			/*
+			 * This is possible if the metadata creation on the consumer side
+			 * is in flight vis-a-vis a concurrent push metadata from the
+			 * session daemon.  Simply return that the channel failed and the
+			 * session daemon will handle that message correctly considering
+			 * that this race is acceptable thus the DBG() statement here.
+			 */
+			DBG("UST consumer push metadata %" PRIu64 " not found", key);
+			ret_code = LTTCOMM_CONSUMERD_CHANNEL_FAIL;
 			goto end_msg_sessiond;
 		}
 
@@ -1711,7 +1734,7 @@ void lttng_ustconsumer_del_stream(struct lttng_consumer_stream *stream)
  *
  * Return 0 on success or else a negative value.
  */
-static int get_index_values(struct lttng_packet_index *index,
+static int get_index_values(struct ctf_packet_index *index,
 		struct ustctl_consumer_stream *ustream)
 {
 	int ret;
@@ -1876,7 +1899,7 @@ int lttng_ustconsumer_read_subbuffer(struct lttng_consumer_stream *stream,
 	long ret = 0;
 	char dummy;
 	struct ustctl_consumer_stream *ustream;
-	struct lttng_packet_index index;
+	struct ctf_packet_index index;
 
 	assert(stream);
 	assert(stream->ustream);