X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=f4cfa82ce8dcc1179843a806a4d969f432b5391e;hp=70cde9c1028d978d7deb1865ff84fe9455988a56;hb=c5b6f4f08fe8d1abff74c7f6ad3630b7dcf0669d;hpb=228b5bf7fa0bd5cf9e709717e578e28bccd57a73

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 70cde9c10..f4cfa82ce 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -2679,10 +2679,18 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
 		struct pollfd *consumer_sockpoll, struct lttcomm_sock *relayd_sock)
 {
 	int fd = -1, ret = -1;
+	enum lttng_error_code ret_code = LTTNG_OK;
 	struct consumer_relayd_sock_pair *relayd;
 
 	DBG("Consumer adding relayd socket (idx: %d)", net_seq_idx);
 
+	/* First send a status message before receiving the fds. */
+	ret = consumer_send_status_msg(sock, ret_code);
+	if (ret < 0) {
+		/* Somehow, the session daemon is not responding anymore. */
+		goto error;
+	}
+
 	/* Get relayd reference if exists. */
 	relayd = consumer_find_relayd(net_seq_idx);
 	if (relayd == NULL) {
@@ -2709,6 +2717,13 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
 		goto error;
 	}
 
+	/* We have the fds without error. Send status back. */
+	ret = consumer_send_status_msg(sock, ret_code);
+	if (ret < 0) {
+		/* Somehow, the session daemon is not responding anymore. */
+		goto error;
+	}
+
 	/* Copy socket information and received FD */
 	switch (sock_type) {
 	case LTTNG_STREAM_CONTROL:
@@ -2728,6 +2743,17 @@ int consumer_add_relayd_socket(int net_seq_idx, int sock_type,
 
 		/* Assign new file descriptor */
 		relayd->control_sock.fd = fd;
+
+		/*
+		 * Create a session on the relayd and store the returned id. No need to
+		 * grab the socket lock since the relayd object is not yet visible.
+		 */
+		ret = relayd_create_session(&relayd->control_sock,
+				&relayd->session_id);
+		if (ret < 0) {
+			goto error;
+		}
+
 		break;
 	case LTTNG_STREAM_DATA:
 		/* Copy received lttcomm socket */
@@ -2913,3 +2939,17 @@ data_not_pending:
 	rcu_read_unlock();
 	return 1;
 }
+
+/*
+ * Send a ret code status message to the sessiond daemon.
+ *
+ * Return the sendmsg() return value.
+ */
+int consumer_send_status_msg(int sock, int ret_code)
+{
+	struct lttcomm_consumer_status_msg msg;
+
+	msg.ret_code = ret_code;
+
+	return lttcomm_send_unix_sock(sock, &msg, sizeof(msg));
+}