projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: session destroy hang in per-uid when context cannot be added
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
notification-thread.c
diff --git
a/src/bin/lttng-sessiond/notification-thread.c
b/src/bin/lttng-sessiond/notification-thread.c
index dd1dc3e8fe50753cfe7ac10978a6f6898df25dd3..56f1124fbfbfbde93c7a1ba9959182221e58095d 100644
(file)
--- a/
src/bin/lttng-sessiond/notification-thread.c
+++ b/
src/bin/lttng-sessiond/notification-thread.c
@@
-27,6
+27,7
@@
#include "lttng-sessiond.h"
#include "health-sessiond.h"
#include "thread.h"
#include "lttng-sessiond.h"
#include "health-sessiond.h"
#include "thread.h"
+#include "testpoint.h"
#include "kernel.h"
#include <common/kernel-ctl/kernel-ctl.h>
#include "kernel.h"
#include <common/kernel-ctl/kernel-ctl.h>
@@
-35,6
+36,8
@@
#include <urcu/list.h>
#include <urcu/rculfhash.h>
#include <urcu/list.h>
#include <urcu/rculfhash.h>
+
+int notifier_consumption_paused;
/*
* Destroy the thread data previously created by the init function.
*/
/*
* Destroy the thread data previously created by the init function.
*/
@@
-235,8
+238,8
@@
int notification_channel_socket_create(void)
if (getuid() == 0) {
gid_t gid;
if (getuid() == 0) {
gid_t gid;
- ret =
utils_get_group_id(config.tracing_group_name.value, tr
ue,
- &gid);
+ ret =
utils_get_group_id(the_config.tracing_group_name.val
ue,
+
true,
&gid);
if (ret) {
/* Default to root group. */
gid = 0;
if (ret) {
/* Default to root group. */
gid = 0;
@@
-574,6
+577,17
@@
static int handle_event_notification_pipe(int event_source_fd,
goto end;
}
goto end;
}
+ if (testpoint(sessiond_handle_notifier_event_pipe)) {
+ ret = 0;
+ goto end;
+ }
+
+ if (caa_unlikely(notifier_consumption_paused)) {
+ DBG("Event notifier notification consumption paused, sleeping...");
+ sleep(1);
+ goto end;
+ }
+
ret = handle_notification_thread_event_notification(
state, event_source_fd, domain);
if (ret) {
ret = handle_notification_thread_event_notification(
state, event_source_fd, domain);
if (ret) {
@@
-582,6
+596,7
@@
static int handle_event_notification_pipe(int event_source_fd,
ret = -1;
goto end;
}
ret = -1;
goto end;
}
+
end:
return ret;
}
end:
return ret;
}
@@
-624,7
+639,7
@@
void *thread_notification(void *data)
DBG("[notification-thread] Started notification thread");
DBG("[notification-thread] Started notification thread");
- health_register(health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
+ health_register(
the_
health_sessiond, HEALTH_SESSIOND_TYPE_NOTIFICATION);
rcu_register_thread();
rcu_thread_online();
rcu_register_thread();
rcu_thread_online();
@@
-640,6
+655,10
@@
void *thread_notification(void *data)
goto end;
}
goto end;
}
+ if (testpoint(sessiond_thread_notification)) {
+ goto end;
+ }
+
while (true) {
int fd_count, i;
while (true) {
int fd_count, i;
@@
-759,7
+778,7
@@
error:
end:
rcu_thread_offline();
rcu_unregister_thread();
end:
rcu_thread_offline();
rcu_unregister_thread();
- health_unregister(health_sessiond);
+ health_unregister(
the_
health_sessiond);
return NULL;
}
return NULL;
}
This page took
0.025784 seconds
and
4
git commands to generate.