X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=13c48a67c9636e0a0b3813d328eb46b1c304494d;hb=5615fbca87d2f5f298c50fa530848ed87f2a723e;hp=af375e26d4b049d5d3d2f0be75c6e302f7a95c10;hpb=b6ab01aa1d1c2c4936e19968de1878f2833014b3;p=deliverable%2Flttng-tools.git diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c index af375e26d..13c48a67c 100644 --- a/src/bin/lttng-relayd/health-relayd.c +++ b/src/bin/lttng-relayd/health-relayd.c @@ -15,7 +15,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE #define _LGPL_SOURCE #include #include @@ -37,18 +36,18 @@ #include #include #include -#include #include -#include #include #include #include -#include -#include +#include +#include #include #include #include +#include +#include #include "lttng-relayd.h" #include "health-relayd.h" @@ -136,7 +135,7 @@ int parse_health_env(void) { const char *health_path; - health_path = getenv(LTTNG_RELAYD_HEALTH_ENV); + health_path = lttng_secure_getenv(LTTNG_RELAYD_HEALTH_ENV); if (health_path) { strncpy(health_unix_sock_path, health_path, PATH_MAX); @@ -150,7 +149,7 @@ static int setup_health_path(void) { int is_root, ret = 0; - char *home_path = NULL, *rundir = NULL, *relayd_path; + char *home_path = NULL, *rundir = NULL, *relayd_path = NULL; ret = parse_health_env(); if (ret) { @@ -208,7 +207,7 @@ int setup_health_path(void) } snprintf(health_unix_sock_path, sizeof(health_unix_sock_path), DEFAULT_GLOBAL_RELAY_HEALTH_UNIX_SOCK, - getpid()); + (int) getpid()); } else { /* Set health check Unix path */ if (strlen(health_unix_sock_path) != 0) { @@ -217,11 +216,46 @@ int setup_health_path(void) snprintf(health_unix_sock_path, sizeof(health_unix_sock_path), DEFAULT_HOME_RELAY_HEALTH_UNIX_SOCK, - home_path, getpid()); + home_path, (int) getpid()); } end: free(rundir); + free(relayd_path); + return ret; +} + +static +int open_unix_socket(void *data, int *out_fd) +{ + int ret; + const char *path = data; + + ret = lttcomm_create_unix_sock(path); + if (ret < 0) { + goto end; + } + + *out_fd = ret; + ret = 0; +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; } @@ -236,6 +270,7 @@ void *thread_manage_health(void *data) struct health_comm_msg msg; struct health_comm_reply reply; int is_root; + char *sock_name; DBG("[thread] Manage health check started"); @@ -247,10 +282,19 @@ void *thread_manage_health(void *data) lttng_poll_init(&events); /* Create unix socket */ - sock = lttcomm_create_unix_sock(health_unix_sock_path); - if (sock < 0) { + ret = asprintf(&sock_name, "Unix socket @ %s", health_unix_sock_path); + if (ret == -1) { + PERROR("Failed to allocate unix socket name"); + err = -1; + goto error; + } + ret = fd_tracker_open_unsuspendable_fd(the_fd_tracker, &sock, + (const char **) &sock_name, 1, open_unix_socket, + health_unix_sock_path); + free(sock_name); + if (ret < 0) { ERR("Unable to create health check Unix socket"); - ret = -1; + err = -1; goto error; } @@ -262,7 +306,7 @@ void *thread_manage_health(void *data) if (ret < 0) { ERR("Unable to set group on %s", health_unix_sock_path); PERROR("chown"); - ret = -1; + err = -1; goto error; } @@ -271,7 +315,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; } } @@ -308,6 +352,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 */ @@ -330,6 +376,11 @@ 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) { @@ -339,15 +390,30 @@ restart: /* Event on the registration socket */ if (pollfd == sock) { - if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { + if (revents & LPOLLIN) { + continue; + } else if (revents & (LPOLLERR | LPOLLHUP | LPOLLRDHUP)) { ERR("Health socket poll error"); goto error; + } else { + ERR("Unexpected poll events %u for sock %d", revents, pollfd); + goto error; } } } - 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; } @@ -361,7 +427,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"); } @@ -392,22 +460,26 @@ 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"); } new_sock = -1; } -exit: error: + lttng_relay_stop_threads(); +exit: if (err) { ERR("Health error occurred in %s", __func__); } DBG("Health check thread dying"); unlink(health_unix_sock_path); if (sock >= 0) { - ret = close(sock); + ret = fd_tracker_close_unsuspendable_fd(the_fd_tracker, &sock, + 1, fd_tracker_util_close_fd, NULL); if (ret) { PERROR("close"); }