From: David Goulet <dgoulet@efficios.com>
Date: Fri, 5 Jul 2013 18:41:58 +0000 (-0400)
Subject: Fix: don't try to send stream to relayd if not in streaming
X-Git-Tag: v2.3.0-rc1~64
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=62285ea4204cca5f6705abc1f798c6268ef2c7b1;p=lttng-tools.git

Fix: don't try to send stream to relayd if not in streaming

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/ust-consumer/ust-consumer.c b/src/common/ust-consumer/ust-consumer.c
index 3133835be..1bb07c0c7 100644
--- a/src/common/ust-consumer/ust-consumer.c
+++ b/src/common/ust-consumer/ust-consumer.c
@@ -373,18 +373,20 @@ static int send_sessiond_channel(int sock,
 
 	DBG("UST consumer sending channel %s to sessiond", channel->name);
 
-	cds_list_for_each_entry(stream, &channel->streams.head, send_node) {
-		/* Try to send the stream to the relayd if one is available. */
-		ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
-		if (ret < 0) {
-			/*
-			 * Flag that the relayd was the problem here probably due to a
-			 * communicaton error on the socket.
-			 */
-			if (relayd_error) {
-				*relayd_error = 1;
+	if (channel->relayd_id != (uint64_t) -1ULL) {
+		cds_list_for_each_entry(stream, &channel->streams.head, send_node) {
+			/* Try to send the stream to the relayd if one is available. */
+			ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
+			if (ret < 0) {
+				/*
+				 * Flag that the relayd was the problem here probably due to a
+				 * communicaton error on the socket.
+				 */
+				if (relayd_error) {
+					*relayd_error = 1;
+				}
+				ret_code = LTTNG_ERR_RELAYD_CONNECT_FAIL;
 			}
-			ret_code = LTTNG_ERR_RELAYD_CONNECT_FAIL;
 		}
 	}
 
@@ -701,11 +703,13 @@ static int setup_metadata(struct lttng_consumer_local_data *ctx, uint64_t key)
 	}
 
 	/* Send metadata stream to relayd if needed. */
-	ret = consumer_send_relayd_stream(metadata->metadata_stream,
-			metadata->pathname);
-	if (ret < 0) {
-		ret = LTTCOMM_CONSUMERD_ERROR_METADATA;
-		goto error;
+	if (metadata->metadata_stream->net_seq_idx != (uint64_t) -1ULL) {
+		ret = consumer_send_relayd_stream(metadata->metadata_stream,
+				metadata->pathname);
+		if (ret < 0) {
+			ret = LTTCOMM_CONSUMERD_ERROR_METADATA;
+			goto error;
+		}
 	}
 
 	ret = send_streams_to_thread(metadata, ctx);