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

fix possible dataraces in ReplicatedMergeTree

Browse Source
This commit is contained in:
Nikita Mikhaylov 2019-10-02 12:59:44 +03:00 committed by GitHub
parent 0e9cad2276
commit 13e2034084
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dbms/src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -5106,19 +5106,20 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
Transaction transaction(*dest_table_storage);
{
auto data_parts_lock = lockParts();
auto dest_data_parts_lock = dest_table_storage->lockParts();
for (MutableDataPartPtr & part : dst_parts)
dest_table_storage->renameTempPartAndReplace(part, nullptr, &transaction, data_parts_lock);
dest_table_storage->renameTempPartAndReplace(part, nullptr, &transaction, dest_data_parts_lock);
}
op_results = zookeeper->multi(ops);
{
auto data_parts_lock = lockParts();
transaction.commit(&data_parts_lock);
parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, data_parts_lock);
auto src_data_parts_lock = lockParts();
auto dest_data_parts_lock = dest_table_storage->lockParts();
transaction.commit(&src_data_parts_lock);
parts_to_remove = removePartsInRangeFromWorkingSet(drop_range, true, false, src_data_parts_lock);
}
PartLog::addNewParts(global_context, dst_parts, watch.elapsed());