X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.c;h=514278d91fd930fac88603286e93fec16c7691a5;hb=5ba15d379e34c74726269b4999295c02c93ed299;hp=b2c454deb54302362806dd80180f9b235f29e33a;hpb=57377f7d429861f13137ce2bc9ac216ae7d0267a;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index b2c454deb..514278d91 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -775,10 +775,19 @@ static int flush_channel(uint64_t chan_key)
 		health_code_update();
 
 		pthread_mutex_lock(&stream->lock);
+
+		/*
+		 * Protect against concurrent teardown of a stream.
+		 */
+		if (cds_lfht_is_node_deleted(&stream->node.node)) {
+			goto next;
+		}
+
 		if (!stream->quiescent) {
 			ustctl_flush_buffer(stream->ustream, 0);
 			stream->quiescent = true;
 		}
+next:
 		pthread_mutex_unlock(&stream->lock);
 	}
 error:
@@ -1712,7 +1721,7 @@ end_get_channel_nosignal:
 			 */
 			DBG("UST consumer push metadata %" PRIu64 " not found", key);
 			ret_code = LTTCOMM_CONSUMERD_CHANNEL_FAIL;
-			goto end_msg_sessiond;
+			goto end_push_metadata_msg_sessiond;
 		}
 
 		health_code_update();
@@ -1723,14 +1732,14 @@ end_get_channel_nosignal:
 			 * checked whether the channel can be found.
 			 */
 			ret_code = LTTCOMM_CONSUMERD_SUCCESS;
-			goto end_msg_sessiond;
+			goto end_push_metadata_msg_sessiond;
 		}
 
 		/* Tell session daemon we are ready to receive the metadata. */
 		ret = consumer_send_status_msg(sock, LTTCOMM_CONSUMERD_SUCCESS);
 		if (ret < 0) {
 			/* Somehow, the session daemon is not responding anymore. */
-			goto error_fatal;
+			goto error_push_metadata_fatal;
 		}
 
 		health_code_update();
@@ -1740,7 +1749,7 @@ end_get_channel_nosignal:
 		ret = lttng_consumer_poll_socket(consumer_sockpoll);
 		health_poll_exit();
 		if (ret) {
-			goto error_fatal;
+			goto error_push_metadata_fatal;
 		}
 
 		health_code_update();
@@ -1749,11 +1758,15 @@ end_get_channel_nosignal:
 				len, version, channel, 0, 1);
 		if (ret < 0) {
 			/* error receiving from sessiond */
-			goto error_fatal;
+			goto error_push_metadata_fatal;
 		} else {
 			ret_code = ret;
-			goto end_msg_sessiond;
+			goto end_push_metadata_msg_sessiond;
 		}
+end_push_metadata_msg_sessiond:
+		goto end_msg_sessiond;
+error_push_metadata_fatal:
+		goto error_fatal;
 	}
 	case LTTNG_CONSUMER_SETUP_METADATA:
 	{
@@ -1980,7 +1993,7 @@ end_get_channel_nosignal:
 		ret = consumer_send_status_msg(sock, ret_code);
 		if (ret < 0) {
 			/* Somehow, the session daemon is not responding anymore. */
-			goto end_nosignal;
+			goto end_rotate_channel_nosignal;
 		}
 
 		/*
@@ -1998,6 +2011,8 @@ end_get_channel_nosignal:
 			}
 		}
 		break;
+end_rotate_channel_nosignal:
+		goto end_nosignal;
 	}
 	case LTTNG_CONSUMER_INIT:
 	{
@@ -2090,6 +2105,9 @@ end_get_channel_nosignal:
 				msg.u.close_trace_chunk.close_command.value;
 		const uint64_t relayd_id =
 				msg.u.close_trace_chunk.relayd_id.value;
+		struct lttcomm_consumer_close_trace_chunk_reply reply;
+		char closed_trace_chunk_path[LTTNG_PATH_MAX];
+		int ret;
 
 		ret_code = lttng_consumer_close_trace_chunk(
 				msg.u.close_trace_chunk.relayd_id.is_set ?
@@ -2100,8 +2118,19 @@ end_get_channel_nosignal:
 				(time_t) msg.u.close_trace_chunk.close_timestamp,
 				msg.u.close_trace_chunk.close_command.is_set ?
 						&close_command :
-						NULL);
-		goto end_msg_sessiond;
+						NULL, closed_trace_chunk_path);
+		reply.ret_code = ret_code;
+		reply.path_length = strlen(closed_trace_chunk_path) + 1;
+		ret = lttcomm_send_unix_sock(sock, &reply, sizeof(reply));
+		if (ret != sizeof(reply)) {
+			goto error_fatal;
+		}
+		ret = lttcomm_send_unix_sock(sock, closed_trace_chunk_path,
+				reply.path_length);
+		if (ret != reply.path_length) {
+			goto error_fatal;
+		}
+		goto end_nosignal;
 	}
 	case LTTNG_CONSUMER_TRACE_CHUNK_EXISTS:
 	{
@@ -3025,7 +3054,7 @@ end:
  * Stop a given metadata channel timer if enabled and close the wait fd which
  * is the poll pipe of the metadata stream.
  *
- * This MUST be called with the metadata channel acquired.
+ * This MUST be called with the metadata channel lock acquired.
  */
 void lttng_ustconsumer_close_metadata(struct lttng_consumer_channel *metadata)
 {