Skip to content

Commit

Permalink
squash w/ startup/shutdown. Attach issue numbers to TODOs. Remove ASa…
Browse files Browse the repository at this point in the history
…n PP block in agent_main.cpp.
  • Loading branch information
korydraughn committed Nov 11, 2024
1 parent 151f81f commit 4abb262
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
7 changes: 0 additions & 7 deletions server/main_server/src/agent_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -937,13 +937,6 @@ namespace
: log_agent::error("Agent [{}] exiting with status = {}", getpid(), status);
// clang-format on

#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
// This function must be called here due to the use of _exit() (just below). Address Sanitizer (ASan)
// relies on std::atexit handlers to report its findings. _exit() does not trigger any of the handlers
// registered by ASan, therefore, we manually run ASan just before the agent exits.
__lsan_do_leak_check();
#endif

return (0 == status) ? 0 : 1;
} // handle_client_request

Expand Down
4 changes: 2 additions & 2 deletions server/main_server/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ auto main(int _argc, char* _argv[]) -> int
dnsc::init("irods_dns_cache", irods::get_dns_cache_shared_memory_size());
irods::at_scope_exit deinit_dns_cache{[] { dnsc::deinit(); }};

// TODO These directories should be created by the packaging.
// TODO(#8014): These directories should be created by the packaging.
fs::create_directories(irods::get_irods_stacktrace_directory().c_str());
fs::create_directories((irods::get_irods_home_directory() / "log/proc").c_str());

Expand Down Expand Up @@ -1395,7 +1395,7 @@ Environment Variables:
};
} // remove_leftover_agent_info_files_for_ips

// TODO This can be used to check if the server running the OLD delay server leader is running.
// TODO(#8015): This can be used to check if the server running the old delay server leader is running.
// The idea is that this gives us a strong guarantee around delay server migration and leader promotion.
// The successor would use this to contact the server which was running the old delay server. The successor
// could use this to determine if the leader was still responsive.
Expand Down

0 comments on commit 4abb262

Please sign in to comment.