projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: perform local data pending before checking data pending with relayd
[lttng-tools.git]
/
src
/
bin
/
lttng-relayd
/
health-relayd.c
diff --git
a/src/bin/lttng-relayd/health-relayd.c
b/src/bin/lttng-relayd/health-relayd.c
index c6dd2e8523f3466abb81d97356b1c13ce1f71273..ba996621b0058ca62f94a7d1c4b001a5737b1b2e 100644
(file)
--- a/
src/bin/lttng-relayd/health-relayd.c
+++ b/
src/bin/lttng-relayd/health-relayd.c
@@
-37,7
+37,6
@@
#include <sys/mman.h>
#include <assert.h>
#include <urcu/compiler.h>
#include <sys/mman.h>
#include <assert.h>
#include <urcu/compiler.h>
-#include <ulimit.h>
#include <inttypes.h>
#include <common/defaults.h>
#include <inttypes.h>
#include <common/defaults.h>
@@
-250,7
+249,7
@@
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");
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;
}
goto error;
}
@@
-262,7
+261,7
@@
void *thread_manage_health(void *data)
if (ret < 0) {
ERR("Unable to set group on %s", health_unix_sock_path);
PERROR("chown");
if (ret < 0) {
ERR("Unable to set group on %s", health_unix_sock_path);
PERROR("chown");
-
ret
= -1;
+
err
= -1;
goto error;
}
goto error;
}
@@
-271,7
+270,7
@@
void *thread_manage_health(void *data)
if (ret < 0) {
ERR("Unable to set permissions on %s", health_unix_sock_path);
PERROR("chmod");
if (ret < 0) {
ERR("Unable to set permissions on %s", health_unix_sock_path);
PERROR("chmod");
-
ret
= -1;
+
err
= -1;
goto error;
}
}
goto error;
}
}
@@
-409,8
+408,9
@@
restart:
new_sock = -1;
}
new_sock = -1;
}
-exit:
error:
error:
+ lttng_relay_stop_threads();
+exit:
if (err) {
ERR("Health error occurred in %s", __func__);
}
if (err) {
ERR("Health error occurred in %s", __func__);
}
This page took
0.024164 seconds
and
4
git commands to generate.