X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=bf3bb8d82cd48bc3fb4ff02a7b56b198aa7ba881;hp=b14b8277250f25f910588f12f50c293647e291a1;hb=1c9bd75bb3b9042c5ba1221c344af8b80b9dcaaf;hpb=e55c055d9742a9af996214af306ea68c51e168d8

diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c
index b14b82772..bf3bb8d82 100644
--- a/src/bin/lttng-relayd/health-relayd.c
+++ b/src/bin/lttng-relayd/health-relayd.c
@@ -47,6 +47,7 @@
 #include <common/sessiond-comm/sessiond-comm.h>
 #include <common/utils.h>
 #include <common/compat/getenv.h>
+#include <common/fd-tracker/utils.h>
 
 #include "lttng-relayd.h"
 #include "health-relayd.h"
@@ -55,7 +56,7 @@
 static
 char health_unix_sock_path[PATH_MAX];
 
-int health_quit_pipe[2];
+int health_quit_pipe[2] = { -1, -1 };
 
 /*
  * Check if the thread quit pipe was triggered.
@@ -105,8 +106,15 @@ static int create_lttng_rundir_with_perm(const char *rundir)
 		int is_root = !getuid();
 
 		if (is_root) {
-			ret = chown(rundir, 0,
-					utils_get_group_id(tracing_group_name));
+			gid_t gid;
+
+			ret = utils_get_group_id(tracing_group_name, true, &gid);
+			if (ret) {
+				/* Default to root group. */
+				gid = 0;
+			}
+
+			ret = chown(rundir, 0, gid);
 			if (ret < 0) {
 				ERR("Unable to set group on %s", rundir);
 				PERROR("chown");
@@ -148,7 +156,8 @@ static
 int setup_health_path(void)
 {
 	int is_root, ret = 0;
-	char *home_path = NULL, *rundir = NULL, *relayd_path = NULL;
+	const char *home_path = NULL;
+	char *rundir = NULL, *relayd_path = NULL;
 
 	ret = parse_health_env();
 	if (ret) {
@@ -224,6 +233,23 @@ end:
 	return ret;
 }
 
+static
+int accept_unix_socket(void *data, int *out_fd)
+{
+	int ret;
+	int accepting_sock = *((int *) data);
+
+	ret = lttcomm_accept_unix_sock(accepting_sock);
+	if (ret < 0) {
+		goto end;
+	}
+
+	*out_fd = ret;
+	ret = 0;
+end:
+	return ret;
+}
+
 /*
  * Thread managing health check socket.
  */
@@ -249,19 +275,26 @@ void *thread_manage_health(void *data)
 	sock = lttcomm_create_unix_sock(health_unix_sock_path);
 	if (sock < 0) {
 		ERR("Unable to create health check Unix socket");
-		ret = -1;
+		err = -1;
 		goto error;
 	}
 
 	is_root = !getuid();
 	if (is_root) {
 		/* lttng health client socket path permissions */
-		ret = chown(health_unix_sock_path, 0,
-				utils_get_group_id(tracing_group_name));
+		gid_t gid;
+
+		ret = utils_get_group_id(tracing_group_name, true, &gid);
+		if (ret) {
+			/* Default to root group. */
+			gid = 0;
+		}
+
+		ret = chown(health_unix_sock_path, 0, gid);
 		if (ret < 0) {
 			ERR("Unable to set group on %s", health_unix_sock_path);
 			PERROR("chown");
-			ret = -1;
+			err = -1;
 			goto error;
 		}
 
@@ -270,7 +303,7 @@ void *thread_manage_health(void *data)
 		if (ret < 0) {
 			ERR("Unable to set permissions on %s", health_unix_sock_path);
 			PERROR("chmod");
-			ret = -1;
+			err = -1;
 			goto error;
 		}
 	}
@@ -307,6 +340,8 @@ void *thread_manage_health(void *data)
 	lttng_relay_notify_ready();
 
 	while (1) {
+		char *accepted_socket_name;
+
 		DBG("Health check ready");
 
 		/* Inifinite blocking call, waiting for transmission */
@@ -329,11 +364,6 @@ restart:
 			revents = LTTNG_POLL_GETEV(&events, i);
 			pollfd = LTTNG_POLL_GETFD(&events, i);
 
-			if (!revents) {
-				/* No activity for this FD (poll implementation). */
-				continue;
-			}
-
 			/* Thread quit pipe has been closed. Killing thread. */
 			ret = check_health_quit_pipe(pollfd, revents);
 			if (ret) {
@@ -355,8 +385,18 @@ restart:
 			}
 		}
 
-		new_sock = lttcomm_accept_unix_sock(sock);
-		if (new_sock < 0) {
+		ret = asprintf(&accepted_socket_name, "Socket accepted from unix socket @ %s",
+				health_unix_sock_path);
+		if (ret == -1) {
+			PERROR("Failed to allocate name of accepted socket from unix socket @ %s",
+					health_unix_sock_path);
+			goto error;
+		}
+		ret = fd_tracker_open_unsuspendable_fd(the_fd_tracker, &new_sock,
+				(const char **) &accepted_socket_name, 1,
+				accept_unix_socket, &sock);
+		free(accepted_socket_name);
+		if (ret < 0) {
 			goto error;
 		}
 
@@ -370,7 +410,9 @@ restart:
 		ret = lttcomm_recv_unix_sock(new_sock, (void *)&msg, sizeof(msg));
 		if (ret <= 0) {
 			DBG("Nothing recv() from client... continuing");
-			ret = close(new_sock);
+			ret = fd_tracker_close_unsuspendable_fd(the_fd_tracker,
+					&new_sock, 1, fd_tracker_util_close_fd,
+					NULL);
 			if (ret) {
 				PERROR("close");
 			}
@@ -401,7 +443,9 @@ restart:
 		}
 
 		/* End of transmission */
-		ret = close(new_sock);
+		ret = fd_tracker_close_unsuspendable_fd(the_fd_tracker,
+				&new_sock, 1, fd_tracker_util_close_fd,
+				NULL);
 		if (ret) {
 			PERROR("close");
 		}