-
Notifications
You must be signed in to change notification settings - Fork 7.7k
[core] Create event log files lazily to avoid stale/empty logs #64366
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nuocbiendang12
wants to merge
2
commits into
ray-project:master
Choose a base branch
from
nnmt2810:fix/64153-lazy-log-creation
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+52
−13
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,7 @@ | |
| #include <iomanip> | ||
| #include <iostream> | ||
| #include <memory> | ||
| #include <mutex> | ||
| #include <sstream> | ||
| #include <string> | ||
| #include <utility> | ||
|
|
@@ -126,6 +127,15 @@ class LogEventReporter : public BaseEventReporter { | |
|
|
||
| virtual void Flush(); | ||
|
|
||
| /** | ||
| * @brief Lazily initializes log_sink_ on the first write. | ||
| * | ||
| * Ensures that no log file is created on disk unless at least one event | ||
| * is actually written, avoiding stale/empty log files. | ||
| * Fixes: https://github.com/ray-project/ray/issues/64153 | ||
| */ | ||
| void EnsureSinkInitialized(); | ||
|
cursor[bot] marked this conversation as resolved.
|
||
|
|
||
| std::string GetReporterKey() override { return "log.event.reporter"; } | ||
|
|
||
| protected: | ||
|
|
@@ -136,7 +146,15 @@ class LogEventReporter : public BaseEventReporter { | |
|
|
||
| std::string file_name_; | ||
|
|
||
| // The key used to look up / register the spdlog logger. Stored to enable | ||
| // lazy initialization of log_sink_ in EnsureSinkInitialized(). | ||
| std::string log_sink_key_; | ||
|
|
||
| // The underlying spdlog logger. nullptr until the first event is written. | ||
| std::shared_ptr<spdlog::logger> log_sink_; | ||
|
Comment on lines
+153
to
154
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To support thread-safe lazy initialization of // The underlying spdlog logger. nullptr until the first event is written.
std::shared_ptr<spdlog::logger> log_sink_;
// Ensure thread-safe lazy initialization of log_sink_.
std::once_flag sink_init_once_; |
||
|
|
||
| // Ensure thread-safe lazy initialization of log_sink_. | ||
| std::once_flag sink_init_once_; | ||
| }; | ||
|
|
||
| // store the reporters, add reporters and clean reporters | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In a multi-threaded environment,
EventManager::Publishcan be called concurrently from multiple threads because it only acquires a reader lock (absl::ReaderMutexLock). This meansLogEventReporter::Report(and consequentlyEnsureSinkInitialized) can be executed concurrently by multiple threads.Without synchronization, the check
if (log_sink_ != nullptr)and the subsequent initialization oflog_sink_(which is astd::shared_ptr) is a data race, leading to undefined behavior. Furthermore, concurrent calls tospdlog::rotating_logger_mtwith the same key will throw aspdlog_exexception, causing the process to crash.To resolve this, we should use
std::call_oncewith astd::once_flagto ensure thatlog_sink_is initialized safely and exactly once.