X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=5f56ba9b318ea14ec94f66e9c00f7408b8f21f4e;hp=44fb2e27cb99a1bc34feeeaaa7d7d618bcbb72f3;hb=245f8bec36f63ba93143f9d5fc346553ce1dbe0a;hpb=81164b6b222b4bafe1e3cec57c50429ab6dab30f

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 44fb2e27c..5f56ba9b3 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -2318,8 +2318,13 @@ static int relay_recv_index(const struct lttcomm_relayd_hdr *recv_hdr,
 		/* no flush. */
 		ret = 0;
 	} else {
+		/*
+		 * ret < 0
+		 *
+		 * relay_index_try_flush is responsible for the self-reference
+		 * put of the index object on error.
+		 */
 		ERR("relay_index_try_flush error %d", ret);
-		relay_index_put(index);
 		ret = -1;
 	}
 
@@ -2820,7 +2825,8 @@ int relay_rotate_pending(const struct lttcomm_relayd_hdr *recv_hdr,
 
 	chunk_id = be64toh(msg.chunk_id);
 
-	DBG("Evaluating rotate pending for chunk id %" PRIu64, chunk_id);
+	DBG("Evaluating rotate pending for session \"%s\" and  chunk id %" PRIu64,
+			session->session_name, chunk_id);
 
 	/*
 	 * Iterate over all the streams in the session and check if they are
@@ -3216,9 +3222,13 @@ static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
 		/* No flush. */
 		ret = 0;
 	} else {
-		/* Put self-ref for this index due to error. */
-		relay_index_put(index);
-		index = NULL;
+		/*
+		 * ret < 0
+		 *
+		 * relay_index_try_flush is responsible for the self-reference
+		 * put of the index object on error.
+		 */
+		ERR("relay_index_try_flush error %d", ret);
 		ret = -1;
 	}
 end: