X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Flive.cpp;h=9cdc1c8d751d78b0876d1cd35c88026b72b4c6cf;hb=8cd15f6adb2b119ef9ea231363d74818e14ecffc;hp=c169be918f0b87891b8bc61785ff6610aa952f1a;hpb=7c2f789a14457b69b934ccea5deb8d2404cae1ee;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/live.cpp b/src/bin/lttng-relayd/live.cpp
index c169be918..9cdc1c8d7 100644
--- a/src/bin/lttng-relayd/live.cpp
+++ b/src/bin/lttng-relayd/live.cpp
@@ -1167,6 +1167,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,
@@ -1307,6 +1317,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);