Fix: reset current size for tracefile rotation

Fixes #514

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 156fc83ee6d534599bbb6d44a1b747099eeb08c2..71c9f2b49105ac665faf805c444d7ef6a984b548 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1636,6 +1636,8 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
                        goto end;
                }
                stream->fd = ret;
                        goto end;
                }
                stream->fd = ret;

+               /* Reset current size because we just perform a stream rotation. */
+               stream->tracefile_size_current = 0;

        }
        stream->tracefile_size_current += data_size;
        do {
        }
        stream->tracefile_size_current += data_size;
        do {

diff --git a/src/common/consumer.c b/src/common/consumer.c
index c4518cc03a7d8891715704cd40a8983f50d08650..01266a700cb37199966c9257eba335689e877453 100644 (file)
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -1424,6 +1424,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
                                goto end;
                        }
                        outfd = stream->out_fd = ret;
                                goto end;
                        }
                        outfd = stream->out_fd = ret;

+                       /* Reset current size because we just perform a rotation. */
+                       stream->tracefile_size_current = 0;

                }
                stream->tracefile_size_current += len;
        }
                }
                stream->tracefile_size_current += len;
        }


@@ -1604,6 +1606,8 @@ ssize_t lttng_consumer_on_read_subbuffer_splice(
                                goto end;
                        }
                        outfd = stream->out_fd = ret;
                                goto end;
                        }
                        outfd = stream->out_fd = ret;

+                       /* Reset current size because we just perform a rotation. */
+                       stream->tracefile_size_current = 0;

                }
                stream->tracefile_size_current += len;
        }
                }
                stream->tracefile_size_current += len;
        }