thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix benign race condition during shutdown

Browse Source
This commit is contained in:
alesapin 2020-06-08 19:34:42 +03:00 committed by Alexey Milovidov
parent bdeafe830b
commit de59629b38
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -2961,7 +2961,6 @@ void StorageReplicatedMergeTree::startup()
void StorageReplicatedMergeTree::shutdown() void StorageReplicatedMergeTree::shutdown()
{ {
clearOldPartsFromFilesystem(true);
/// Cancel fetches, merges and mutations to force the queue_task to finish ASAP. /// Cancel fetches, merges and mutations to force the queue_task to finish ASAP.
fetcher.blocker.cancelForever(); fetcher.blocker.cancelForever();
merger_mutator.merges_blocker.cancelForever(); merger_mutator.merges_blocker.cancelForever();
@ -2997,6 +2996,12 @@ void StorageReplicatedMergeTree::shutdown()
std::unique_lock lock(data_parts_exchange_endpoint->rwlock); std::unique_lock lock(data_parts_exchange_endpoint->rwlock);
} }
data_parts_exchange_endpoint.reset(); data_parts_exchange_endpoint.reset();
/// We clear all parts after stopping all background operations. It's
/// important, because background operations can produce temporary parts
/// which will remove themselfs in their descrutors. If so, we may have race
/// condition between our remove call and background process.
clearOldPartsFromFilesystem(true);
} }