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

diff --git a/src/bin/lttng-relayd/live.c b/src/bin/lttng-relayd/live.c
index 5365e17a7..f1e440640 100644
--- a/src/bin/lttng-relayd/live.c
+++ b/src/bin/lttng-relayd/live.c
@@ -374,7 +374,7 @@ static int make_viewer_streams(struct relay_session *relay_session,
 				 * chunk can be used safely.
 				 */
 				if ((relay_stream->ongoing_rotation.is_set ||
-						    relay_session->ongoing_rotation) &&
+						session_has_ongoing_rotation(relay_session)) &&
 						relay_stream->trace_chunk) {
 					viewer_stream_trace_chunk = lttng_trace_chunk_copy(
 							relay_stream->trace_chunk);
@@ -1170,7 +1170,7 @@ int viewer_get_new_streams(struct relay_connection *conn)
 	 * stream, because the chunk can be in an intermediate state
 	 * due to directory renaming.
 	 */
-	if (session->ongoing_rotation) {
+	if (session_has_ongoing_rotation(session)) {
 		DBG("Relay session %" PRIu64 " rotation ongoing", session_id);
 		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_NO_NEW);
 		goto send_reply_unlock;
@@ -1180,7 +1180,12 @@ int viewer_get_new_streams(struct relay_connection *conn)
 			LTTNG_VIEWER_SEEK_BEGINNING, &nb_total, &nb_unsent,
 			&nb_created, &closed);
 	if (ret < 0) {
-		goto error_unlock_session;
+		/*
+		 * This is caused by an internal error; propagate the negative
+		 * 'ret' to close the connection.
+		 */
+		response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_ERR);
+		goto send_reply;
 	}
 	send_streams = 1;
 	response.status = htobe32(LTTNG_VIEWER_NEW_STREAMS_OK);
@@ -1235,10 +1240,6 @@ end_put_session:
 	}
 error:
 	return ret;
-error_unlock_session:
-	pthread_mutex_unlock(&session->lock);
-	session_put(session);
-	return ret;
 }
 
 /*
@@ -1320,7 +1321,7 @@ int viewer_attach_session(struct relay_connection *conn)
 	 * stream, because the chunk can be in an intermediate state
 	 * due to directory renaming.
 	 */
-	if (session->ongoing_rotation) {
+	if (session_has_ongoing_rotation(session)) {
 		DBG("Relay session %" PRIu64 " rotation ongoing", session_id);
 		send_streams = 0;
 		goto send_reply;
@@ -1630,6 +1631,13 @@ int viewer_get_next_index(struct relay_connection *conn)
 	metadata_viewer_stream =
 			ctf_trace_get_viewer_metadata_stream(ctf_trace);
 
+	/*
+	 * Hold the session lock to protect against concurrent changes
+	 * to the chunk files (e.g. rename done by clear), which are
+	 * protected by the session ongoing rotation state. Those are
+	 * synchronized with the session lock.
+	 */
+	pthread_mutex_lock(&rstream->trace->session->lock);
 	pthread_mutex_lock(&rstream->lock);
 
 	/*
@@ -1646,7 +1654,7 @@ int viewer_get_next_index(struct relay_connection *conn)
 		goto send_reply;
 	}
 
-	if (rstream->trace->session->ongoing_rotation) {
+	if (session_has_ongoing_rotation(rstream->trace->session)) {
 		/* Rotation is ongoing, try again later. */
 		viewer_index.status = htobe32(LTTNG_VIEWER_INDEX_RETRY);
 		goto send_reply;
@@ -1796,6 +1804,7 @@ int viewer_get_next_index(struct relay_connection *conn)
 send_reply:
 	if (rstream) {
 		pthread_mutex_unlock(&rstream->lock);
+		pthread_mutex_unlock(&rstream->trace->session->lock);
 	}
 
 	if (metadata_viewer_stream) {
@@ -1837,6 +1846,7 @@ end:
 
 error_put:
 	pthread_mutex_unlock(&rstream->lock);
+	pthread_mutex_unlock(&rstream->trace->session->lock);
 	if (metadata_viewer_stream) {
 		viewer_stream_put(metadata_viewer_stream);
 	}