X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-stream.c;h=ca2c4536cb78f99758ba1a8ec2e2b81fead12f4f;hb=9276e5c88e693249bd31197baecf58310df8167e;hp=d0b1ddef2259fc57342cac15ef5003f19fc03e6f;hpb=3a84e2f3c3df5b461d9621b64f14abc3b8c3c29c;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-stream.c b/src/common/consumer/consumer-stream.c
index d0b1ddef2..ca2c4536c 100644
--- a/src/common/consumer/consumer-stream.c
+++ b/src/common/consumer/consumer-stream.c
@@ -73,12 +73,8 @@ void consumer_stream_relayd_close(struct lttng_consumer_stream *stream,
 			stream->next_net_seq_num - 1);
 	pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 	if (ret < 0) {
-		DBG("Unable to close stream on the relayd. Continuing");
-		/*
-		 * Continue here. There is nothing we can do for the relayd.
-		 * Chances are that the relayd has closed the socket so we just
-		 * continue cleaning up.
-		 */
+		ERR("Relayd send close stream failed. Cleaning up relayd %" PRIu64 ".", relayd->net_seq_idx);
+		lttng_consumer_cleanup_relayd(relayd);
 	}
 
 	/* Both conditions are met, we destroy the relayd. */
@@ -371,6 +367,15 @@ int consumer_stream_write_index(struct lttng_consumer_stream *stream,
 			pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 			ret = relayd_send_index(&relayd->control_sock, element,
 				stream->relayd_stream_id, stream->next_net_seq_num - 1);
+			if (ret < 0) {
+				/*
+				 * Communication error with lttng-relayd,
+				 * perform cleanup now
+				 */
+				ERR("Relayd send index failed. Cleaning up relayd %" PRIu64 ".", relayd->net_seq_idx);
+				lttng_consumer_cleanup_relayd(relayd);
+				ret = -1;
+			}
 			pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 		} else {
 			ERR("Stream %" PRIu64 " relayd ID %" PRIu64 " unknown. Can't write index.",