X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fhealth-relayd.c;h=8b2febe05c7e55a53f942d2a4e2a22a917acc2c0;hp=2ce1c1fdafa763a180e15d894de041fb55369664;hb=794e2e5f064718252b249e17914c9b2b089d8d0c;hpb=3f28e5619d0a5c2aacef18251b3263bd632199da diff --git a/src/bin/lttng-relayd/health-relayd.c b/src/bin/lttng-relayd/health-relayd.c index 2ce1c1fda..8b2febe05 100644 --- a/src/bin/lttng-relayd/health-relayd.c +++ b/src/bin/lttng-relayd/health-relayd.c @@ -15,7 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _GNU_SOURCE +#define _LGPL_SOURCE #include #include #include @@ -36,28 +36,26 @@ #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" /* Global health check unix path */ -static char health_unix_sock_path[PATH_MAX]; -static char *relayd_path; -static char *lttng_rundir; +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. @@ -107,8 +105,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"); @@ -131,16 +136,41 @@ error: return ret; } +static +int parse_health_env(void) +{ + const char *health_path; + + health_path = lttng_secure_getenv(LTTNG_RELAYD_HEALTH_ENV); + if (health_path) { + strncpy(health_unix_sock_path, health_path, + PATH_MAX); + health_unix_sock_path[PATH_MAX - 1] = '\0'; + } + + return 0; +} + static int setup_health_path(void) { int is_root, ret = 0; - char *home_path = NULL; + const char *home_path = NULL; + char *rundir = NULL, *relayd_path = NULL; + + ret = parse_health_env(); + if (ret) { + return ret; + } is_root = !getuid(); if (is_root) { - lttng_rundir = strdup(DEFAULT_LTTNG_RUNDIR); + rundir = strdup(DEFAULT_LTTNG_RUNDIR); + if (!rundir) { + ret = -ENOMEM; + goto end; + } } else { /* * Create rundir from home path. This will create something like @@ -155,20 +185,20 @@ int setup_health_path(void) goto end; } - ret = asprintf(<tng_rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path); + ret = asprintf(&rundir, DEFAULT_LTTNG_HOME_RUNDIR, home_path); if (ret < 0) { ret = -ENOMEM; goto end; } } - ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, lttng_rundir); + ret = asprintf(&relayd_path, DEFAULT_RELAYD_PATH, rundir); if (ret < 0) { ret = -ENOMEM; goto end; } - ret = create_lttng_rundir_with_perm(lttng_rundir); + ret = create_lttng_rundir_with_perm(rundir); if (ret < 0) { goto end; } @@ -184,7 +214,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) { @@ -193,10 +223,12 @@ 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; } @@ -225,19 +257,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; } @@ -246,7 +285,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; } } @@ -280,6 +319,8 @@ void *thread_manage_health(void *data) goto error; } + lttng_relay_notify_ready(); + while (1) { DBG("Health check ready"); @@ -312,9 +353,14 @@ 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; } } } @@ -346,7 +392,7 @@ restart: assert(msg.cmd == HEALTH_CMD_CHECK); - reply.ret_code = 0; + memset(&reply, 0, sizeof(reply)); for (i = 0; i < NR_HEALTH_RELAYD_TYPES; i++) { /* * health_check_state return 0 if thread is in @@ -372,18 +418,14 @@ restart: 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); - (void) rmdir(relayd_path); - free(relayd_path); - (void) rmdir(lttng_rundir); - free(lttng_rundir); - if (sock >= 0) { ret = close(sock); if (ret) { @@ -391,6 +433,11 @@ error: } } + /* + * We do NOT rmdir rundir nor the relayd path because there are + * other processes using them. + */ + lttng_poll_clean(&events); rcu_unregister_thread();