thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix deadlock at shutdown

Browse Source
This commit is contained in:
Anton Popov 2023-01-08 23:06:35 +00:00
parent fcdbc8123d
commit 1e5d6e44a5
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -1679,7 +1679,11 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks)
if (!unloaded_parts.empty())
{
LOG_DEBUG(log, "Found {} outdated data parts. They will be loaded asynchronously", unloaded_parts.size());
outdated_unloaded_data_parts = std::move(unloaded_parts);
{
std::lock_guard lock(outdated_data_parts_mutex);
outdated_unloaded_data_parts = std::move(unloaded_parts);
}
outdated_data_parts_loading_task = getContext()->getSchedulePool().createTask(
"MergeTreeData::loadOutdatedDataParts",
@ -1695,6 +1699,9 @@ try
{
{
std::lock_guard lock(outdated_data_parts_mutex);
if (outdated_unloaded_data_parts.empty())
return;
LOG_DEBUG(log, "Loading {} outdated data parts {}",
outdated_unloaded_data_parts.size(),
is_async ? "asynchronously" : "synchronously");
@ -1734,7 +1741,8 @@ try
preparePartForRemoval(res.part);
}
LOG_DEBUG(log, "Loaded {} outdated data parts", num_loaded_parts);
LOG_DEBUG(log, "Loaded {} outdated data parts {}",
num_loaded_parts, is_async ? "asynchronously" : "synchronously");
outdated_data_parts_cv.notify_all();
}
catch (...)
@ -3591,7 +3599,7 @@ MergeTreeData::PartsToRemoveFromZooKeeper MergeTreeData::removePartsInRangeFromW
#ifndef NDEBUG
{
/// All parts (including outdated) must be loaded at this moment.
std::lock_guard lock(outdated_data_parts_mutex);
std::lock_guard outdated_parts_lock(outdated_data_parts_mutex);
assert(outdated_unloaded_data_parts.empty());
}
#endif

7
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -910,12 +910,7 @@ void StorageReplicatedMergeTree::drop()
{
/// Load remaining parts synchronously because task
/// for loading is already cancelled in shutdown().
std::lock_guard lock(outdated_data_parts_mutex);
if (!outdated_unloaded_data_parts.empty())
{
assert(outdated_data_parts_loading_canceled);
loadOutdatedDataParts(/*is_async=*/ false);
}
loadOutdatedDataParts(/*is_async=*/ false);
}
dropAllData();