X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.c;h=5365e17a78b6549641abfc5a123cd292e1f4d1fb;hb=8433d9169dcae9f9c5896492b60aae6d43e2d058;hp=3eadbb1084da34ec07db25ceadae6a4fff4d759d;hpb=50c089cf4bc59dd55d4442b01b47c7d83c59edc3;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 3eadbb108..5365e17a7 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -1165,6 +1165,16 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	 * the viewer's point of view.
 	 */
 	pthread_mutex_lock(&session->lock);
+	/*
+	 * If a session rotation is ongoing, do not attempt to open any
+	 * stream, because the chunk can be in an intermediate state
+	 * due to directory renaming.
+	 */
+	if (session->ongoing_rotation) {
+		DBG("Relay session %" PRIu64 " rotation ongoing", session_id);
+		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_NO_NEW);
+		goto send_reply_unlock;
+	}
 	ret = make_viewer_streams(session,
 			conn->viewer_session,
 			LTTNG_VIEWER_SEEK_BEGINNING, &nb_total, &nb_unsent,
@@ -1305,6 +1315,17 @@ int viewer_attach_session(struct relay_connection *conn)
 		goto send_reply;
 	}
 
+	/*
+	 * If a session rotation is ongoing, do not attempt to open any
+	 * stream, because the chunk can be in an intermediate state
+	 * due to directory renaming.
+	 */
+	if (session->ongoing_rotation) {
+		DBG("Relay session %" PRIu64 " rotation ongoing", session_id);
+		send_streams = 0;
+		goto send_reply;
+	}
+
 	ret = make_viewer_streams(session,
 			conn->viewer_session, seek_type,
 			&nb_streams, NULL, NULL, &closed);