thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-25 17:12:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13386 from nikitamikhaylov/text-log-fix-2

Browse Source 
Deadlock in textlog
This commit is contained in:
Nikita Mikhaylov 2020-08-06 12:23:14 +04:00 committed by GitHub
commit f6fe0b9a19
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
base/loggers/OwnSplitChannel.cpp
View File

@ -91,10 +91,13 @@ void OwnSplitChannel::logSplit(const Poco::Message & msg)
elem.source_file = msg.getSourceFile(); elem.source_file = msg.getSourceFile();
elem.source_line = msg.getSourceLine(); elem.source_line = msg.getSourceLine();
std::shared_ptr<TextLog> text_log_locked{};
std::lock_guard<std::mutex> lock(text_log_mutex); {
if (auto log = text_log.lock()) std::lock_guard<std::mutex> lock(text_log_mutex);
log->add(elem); text_log_locked = text_log.lock();
}
if (text_log_locked)
text_log_locked->add(elem);
} }
} }