X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.c;h=322492631af40f22a8833224032fbc871f88cb34;hp=82be751c40ef82e83e47e10e785caa0d131cffbe;hb=9bb5f1f8c4f1aeaca00ebbca40fc145dc4c7ee52;hpb=a6ef8ee6a852f9fa6394408fcc8d4d49891852d9

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 82be751c4..322492631 100644
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -1408,6 +1408,7 @@ void lttng_consumer_cleanup(void)
 {
 	struct lttng_ht_iter iter;
 	struct lttng_consumer_channel *channel;
+	unsigned int trace_chunks_left;
 
 	rcu_read_lock();
 
@@ -1432,6 +1433,27 @@ void lttng_consumer_cleanup(void)
 	 */
 	lttng_ht_destroy(consumer_data.stream_list_ht);
 
+	/*
+	 * Trace chunks in the registry may still exist if the session
+	 * daemon has encountered an internal error and could not
+	 * tear down its sessions and/or trace chunks properly.
+	 *
+	 * Release the session daemon's implicit reference to any remaining
+	 * trace chunk and print an error if any trace chunk was found. Note
+	 * that there are _no_ legitimate cases for trace chunks to be left,
+	 * it is a leak. However, it can happen following a crash of the
+	 * session daemon and not emptying the registry would cause an assertion
+	 * to hit.
+	 */
+	trace_chunks_left = lttng_trace_chunk_registry_put_each_chunk(
+			consumer_data.chunk_registry);
+	if (trace_chunks_left) {
+		ERR("%u trace chunks are leaked by lttng-consumerd. "
+				"This can be caused by an internal error of the session daemon.",
+				trace_chunks_left);
+	}
+	/* Run all callbacks freeing each chunk. */
+	rcu_barrier();
 	lttng_trace_chunk_registry_destroy(consumer_data.chunk_registry);
 }
 
@@ -4558,11 +4580,13 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 			 * channels.
 			 */
 			enum lttcomm_return_code close_ret;
+			char path[LTTNG_PATH_MAX];
 
 			DBG("Failed to set new trace chunk on existing channels, rolling back");
 			close_ret = lttng_consumer_close_trace_chunk(relayd_id,
 					session_id, chunk_id,
-					chunk_creation_timestamp, NULL);
+					chunk_creation_timestamp, NULL,
+					path);
 			if (close_ret != LTTCOMM_CONSUMERD_SUCCESS) {
 				ERR("Failed to roll-back the creation of new chunk: session_id = %" PRIu64 ", chunk_id = %" PRIu64,
 						session_id, chunk_id);
@@ -4588,12 +4612,13 @@ enum lttcomm_return_code lttng_consumer_create_trace_chunk(
 
 		if (!relayd || ret) {
 			enum lttcomm_return_code close_ret;
+			char path[LTTNG_PATH_MAX];
 
 			close_ret = lttng_consumer_close_trace_chunk(relayd_id,
 					session_id,
 					chunk_id,
 					chunk_creation_timestamp,
-					NULL);
+					NULL, path);
 			if (close_ret != LTTCOMM_CONSUMERD_SUCCESS) {
 				ERR("Failed to roll-back the creation of new chunk: session_id = %" PRIu64 ", chunk_id = %" PRIu64,
 						session_id,
@@ -4608,6 +4633,7 @@ error:
 	rcu_read_unlock();
 	/* Release the reference returned by the "publish" operation. */
 	lttng_trace_chunk_put(published_chunk);
+	lttng_trace_chunk_put(created_chunk);
 end:
 	return ret_code;
 }
@@ -4615,7 +4641,8 @@ end:
 enum lttcomm_return_code lttng_consumer_close_trace_chunk(
 		const uint64_t *relayd_id, uint64_t session_id,
 		uint64_t chunk_id, time_t chunk_close_timestamp,
-		const enum lttng_trace_chunk_command_type *close_command)
+		const enum lttng_trace_chunk_command_type *close_command,
+		char *path)
 {
 	enum lttcomm_return_code ret_code = LTTCOMM_CONSUMERD_SUCCESS;
 	struct lttng_trace_chunk *chunk;
@@ -4713,7 +4740,8 @@ enum lttcomm_return_code lttng_consumer_close_trace_chunk(
 		if (relayd) {
 			pthread_mutex_lock(&relayd->ctrl_sock_mutex);
 			ret = relayd_close_trace_chunk(
-					&relayd->control_sock, chunk);
+					&relayd->control_sock, chunk,
+					path);
 			pthread_mutex_unlock(&relayd->ctrl_sock_mutex);
 		} else {
 			ERR("Failed to find relay daemon socket: relayd_id = %" PRIu64,