thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-21 09:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: fixed race condition in ATTACH [#METR-17573].

Browse Source
This commit is contained in:
Alexey Milovidov 2015-09-27 17:22:23 +03:00
parent e96705ed44
commit 932a09ad6e
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dbms/include/DB/Storages/MergeTree/ReplicatedMergeTreeBlockOutputStream.h
View File

@ -109,6 +109,7 @@ public:
StorageReplicatedMergeTree::LogEntry log_entry;
log_entry.type = StorageReplicatedMergeTree::LogEntry::GET_PART;
log_entry.create_time = time(0);
log_entry.source_replica = storage.replica_name;
log_entry.new_part_name = part_name;
log_entry.quorum = quorum;

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

@ -1710,6 +1710,7 @@ void StorageReplicatedMergeTree::mergeSelectingThread()
entry.type = LogEntry::MERGE_PARTS;
entry.source_replica = replica_name;
entry.new_part_name = merged_name;
entry.create_time = time(0);
for (const auto & part : parts)
entry.parts_to_merge.push_back(part->name);
@ -2862,6 +2863,7 @@ void StorageReplicatedMergeTree::dropPartition(const Field & field, bool detach,
entry.detach = detach;
String log_znode_path = zookeeper->create(zookeeper_path + "/log/log-", entry.toString(), zkutil::CreateMode::PersistentSequential);
entry.znode_name = log_znode_path.substr(log_znode_path.find_last_of('/') + 1);
entry.create_time = time(0);
/// Если надо - дожидаемся выполнения операции на себе или на всех репликах.
if (settings.replication_alter_partitions_sync != 0)
@ -2950,6 +2952,8 @@ void StorageReplicatedMergeTree::attachPartition(const Field & field, bool unrep
entry.source_part_name = part_name;
entry.new_part_name = new_part_name;
entry.attach_unreplicated = unreplicated;
entry.create_time = time(0);
ops.push_back(new zkutil::Op::Create(
zookeeper_path + "/log/log-", entry.toString(), zookeeper->getDefaultACL(), zkutil::CreateMode::PersistentSequential));
}