Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zeek-setup: Delete managers on init errors

Browse source 
TSAN complains about storage manager leaking a thread. While we use
jthread and have a comment that it the thread would be joined
automatically, this only happens if we actually destruct the storage_mgr
instance, do so in the init errors case.
This commit is contained in:
Arne Welzel 2025-06-23 10:04:55 +02:00
parent b1157e4e03
commit 86185b9fc2
1 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/zeek-setup.cc
View file

@ -344,6 +344,29 @@ static void done_with_network() {
ZEEK_LSAN_DISABLE(); ZEEK_LSAN_DISABLE();
} }
// Just a helper to destruct all managers without terminating.
static void delete_managers() {
delete zeekygen_mgr;
delete packet_mgr;
delete analyzer_mgr;
delete file_mgr;
delete cluster::manager;
// broker_mgr, timer_mgr, supervisor, and dns_mgr are deleted via iosource_mgr
delete iosource_mgr;
delete event_registry;
delete log_mgr;
delete reporter;
delete plugin_mgr;
delete val_mgr;
delete session_mgr;
delete fragment_mgr;
delete telemetry_mgr;
#ifdef HAVE_SPICY
delete spicy_mgr;
#endif
delete storage_mgr;
}
static void terminate_zeek() { static void terminate_zeek() {
util::detail::set_processing_status("TERMINATING", "terminate_zeek"); util::detail::set_processing_status("TERMINATING", "terminate_zeek");
@ -406,25 +429,7 @@ static void terminate_zeek() {
event_trace_mgr.reset(); event_trace_mgr.reset();
} }
delete zeekygen_mgr; delete_managers();
delete packet_mgr;
delete analyzer_mgr;
delete file_mgr;
delete cluster::manager;
// broker_mgr, timer_mgr, supervisor, and dns_mgr are deleted via iosource_mgr
delete iosource_mgr;
delete event_registry;
delete log_mgr;
delete reporter;
delete plugin_mgr;
delete val_mgr;
delete session_mgr;
delete fragment_mgr;
delete telemetry_mgr;
#ifdef HAVE_SPICY
delete spicy_mgr;
#endif
delete storage_mgr;
// free the global scope // free the global scope
pop_scope(); pop_scope();
@ -1124,8 +1129,10 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
// Drain the event queue here to support the protocols framework configuring DPM // Drain the event queue here to support the protocols framework configuring DPM
event_mgr.Drain(); event_mgr.Drain();
if ( reporter->Errors() > 0 && ! getenv("ZEEK_ALLOW_INIT_ERRORS") ) if ( reporter->Errors() > 0 && ! getenv("ZEEK_ALLOW_INIT_ERRORS") ) {
delete_managers();
reporter->FatalError("errors occurred while initializing"); reporter->FatalError("errors occurred while initializing");
}
run_state::detail::zeek_init_done = true; run_state::detail::zeek_init_done = true;
packet_mgr->DumpDebug(); packet_mgr->DumpDebug();