X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=d57271c3a9d27222c72d95d20128a3fdd4788df6;hp=7911a5b4e8d4d0701d40e88d3ebdd6841c4061af;hb=93ec662e687dc15a3601704a1e0c96c51ad228c9;hpb=b31610f2294a6a827fa2d0d19d71199567db8dc5

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 7911a5b4e..d57271c3a 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1556,6 +1556,16 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		if (stream->metadata_flag) {
 			/* Metadata requires the control socket. */
 			pthread_mutex_lock(&relayd->ctrl_sock_mutex);
+			if (stream->reset_metadata_flag) {
+				ret = relayd_reset_metadata(&relayd->control_sock,
+						stream->relayd_stream_id,
+						stream->metadata_version);
+				if (ret < 0) {
+					relayd_hang_up = 1;
+					goto write_error;
+				}
+				stream->reset_metadata_flag = 0;
+			}
 			netlen += sizeof(struct lttcomm_relayd_metadata_payload);
 		}
 
@@ -1579,6 +1589,15 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		/* No streaming, we have to set the len with the full padding */
 		len += padding;
 
+		if (stream->metadata_flag && stream->reset_metadata_flag) {
+			ret = utils_truncate_stream_file(stream->out_fd, 0);
+			if (ret < 0) {
+				ERR("Reset metadata file");
+				goto end;
+			}
+			stream->reset_metadata_flag = 0;
+		}
+
 		/*
 		 * Check if we need to change the tracefile before writing the packet.
 		 */
@@ -1744,6 +1763,16 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 			 */
 			pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 
+			if (stream->reset_metadata_flag) {
+				ret = relayd_reset_metadata(&relayd->control_sock,
+						stream->relayd_stream_id,
+						stream->metadata_version);
+				if (ret < 0) {
+					relayd_hang_up = 1;
+					goto write_error;
+				}
+				stream->reset_metadata_flag = 0;
+			}
 			ret = write_relayd_metadata_id(splice_pipe[1], stream, relayd,
 					padding);
 			if (ret < 0) {
@@ -1767,6 +1796,14 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
 		/* No streaming, we have to set the len with the full padding */
 		len += padding;
 
+		if (stream->metadata_flag && stream->reset_metadata_flag) {
+			ret = utils_truncate_stream_file(stream->out_fd, 0);
+			if (ret < 0) {
+				ERR("Reset metadata file");
+				goto end;
+			}
+			stream->reset_metadata_flag = 0;
+		}
 		/*
 		 * Check if we need to change the tracefile before writing the packet.
 		 */