/*
- * Copyright (C) 2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#define _LGPL_SOURCE
#include <fcntl.h>
#include <getopt.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"
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");
{
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);
int setup_health_path(void)
{
int is_root, ret = 0;
- char *home_path = NULL, *rundir = NULL, *relayd_path;
+ const char *home_path = NULL;
+ char *rundir = NULL, *relayd_path = NULL;
ret = parse_health_env();
if (ret) {
}
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;
+}
+
+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;
}
struct health_comm_msg msg;
struct health_comm_reply reply;
int is_root;
+ char *sock_name;
DBG("[thread] Manage health check started");
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;
}
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;
}
- /* Size is set to 1 for the consumer_channel pipe */
- ret = lttng_poll_create(&events, 2, LTTNG_CLOEXEC);
+ /* Size is set to 2 for the unix socket and quit pipe. */
+ ret = fd_tracker_util_poll_create(the_fd_tracker,
+ "Health management thread epoll", &events, 2,
+ LTTNG_CLOEXEC);
if (ret < 0) {
ERR("Poll set creation failed");
goto error;
lttng_relay_notify_ready();
while (1) {
+ char *accepted_socket_name;
+
DBG("Health check ready");
/* Inifinite blocking call, waiting for transmission */
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) {
/* 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");
}
}
/* 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");
}
* other processes using them.
*/
- lttng_poll_clean(&events);
+ (void) fd_tracker_util_poll_clean(the_fd_tracker, &events);
rcu_unregister_thread();
return NULL;