From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 19 Nov 2018 21:09:28 +0000 (-0500)
Subject: Fix: relayd: rotation pending off-by-one
X-Git-Tag: v2.12.0-rc1~686
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=2280aad182048e5726940eab9b42a00f5f92b53a;p=lttng-tools.git

Fix: relayd: rotation pending off-by-one

We need to compare with <= rather than < in the rotation pending
check on the relay daemon side, similarly to the check done in
the consumer daemon check_stream_rotation_pending().

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 09aeb33e0..de14cdb43 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2973,7 +2973,7 @@ int relay_rotate_pending(const struct lttcomm_relayd_hdr *recv_hdr,
 			rotate_pending = true;
 			DBG("Stream %" PRIu64 " is still rotating",
 					stream->stream_handle);
-		} else if (stream->current_chunk_id.value < chunk_id) {
+		} else if (stream->current_chunk_id.value <= chunk_id) {
 			/*
 			 * Stream closed on the consumer but still active on the
 			 * relay.