* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <fcntl.h>
#include <getopt.h>
#include <grp.h>
#include <unistd.h>
#include <sys/mman.h>
#include <assert.h>
-#include <config.h>
#include <urcu/compiler.h>
-#include <ulimit.h>
#include <inttypes.h>
#include <common/defaults.h>
#include <common/common.h>
-#include <common/consumer.h>
-#include <common/consumer-timer.h>
+#include <common/consumer/consumer.h>
+#include <common/consumer/consumer-timer.h>
#include <common/compat/poll.h>
#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"
/* 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.
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");
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
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;
}
}
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) {
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 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;
}
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;
}
if (ret < 0) {
ERR("Unable to set permissions on %s", health_unix_sock_path);
PERROR("chmod");
- ret = -1;
+ err = -1;
goto error;
}
}
goto error;
}
+ lttng_relay_notify_ready();
+
while (1) {
+ char *accepted_socket_name;
+
DBG("Health check ready");
/* Inifinite blocking call, waiting for transmission */
/* 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;
}
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");
}
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
}
/* 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);
- (void) rmdir(relayd_path);
- free(relayd_path);
- (void) rmdir(lttng_rundir);
- free(lttng_rundir);
-
if (sock >= 0) {
ret = close(sock);
if (ret) {
}
}
+ /*
+ * We do NOT rmdir rundir nor the relayd path because there are
+ * other processes using them.
+ */
+
lttng_poll_clean(&events);
rcu_unregister_thread();