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

CLICKHOUSE-3847 fix race in set log_pointer in cloneReplica()

Browse Source
This commit is contained in:
VadimPE 2018-08-08 18:25:07 +03:00
parent 3b9002dfc9
commit c16d876867
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1970,26 +1970,19 @@ bool StorageReplicatedMergeTree::cloneReplica(const String & source_replica, zku
/// The order of the following three actions is important. Entries in the log can be duplicated, but they can not be lost. /// The order of the following three actions is important. Entries in the log can be duplicated, but they can not be lost.
/// Copy reference to the log from `reference/master` replica.
zkutil::Requests rec;
/// We must check is_active and set log_pointer atomically in order to cleanupThread can not clear log with our log_pointer. /// We must check is_active and set log_pointer atomically in order to cleanupThread can not clear log with our log_pointer.
rec.push_back(zkutil::makeCheckRequest(source_path + "/is_active", 0)); zookeeper->set(replica_path + "/log_pointer", zookeeper->get(source_path + "/log_pointer"), -1);
rec.push_back(zkutil::makeSetRequest(replica_path + "/log_pointer", zookeeper->get(source_path + "/log_pointer"), -1));
try String raw_log_pointer = zookeeper->get(replica_path + "/log_pointer");
{
zookeeper->multi(rec); Strings entries = zookeeper->getChildren(zookeeper_path + "/log");
}
catch (const zkutil::KeeperException & e) if (!entries.empty())
{
if (e.code == ZooKeeperImpl::ZooKeeper::ZBADVERSION)
return false; return false;
else
throw e;
}
zookeeper->set(replica_path + "/log_pointer", zookeeper->get(source_path + "/log_pointer")); std::sort(entries.begin(), entries.end());
if ("log-" + padIndex(parse<UInt64>(raw_log_pointer)) < entries[0])
return false;
/// Let's remember the queue of the reference/master replica. /// Let's remember the queue of the reference/master replica.
Strings source_queue_names = zookeeper->getChildren(source_path + "/queue"); Strings source_queue_names = zookeeper->getChildren(source_path + "/queue");
@ -2058,7 +2051,8 @@ void StorageReplicatedMergeTree::cloneReplicaIfNeeded()
for (const String & replica_name : zookeeper->getChildren(zookeeper_path + "/replicas")) for (const String & replica_name : zookeeper->getChildren(zookeeper_path + "/replicas"))
{ {
String source_replica_path = zookeeper_path + "/replicas/" + replica_name; String source_replica_path = zookeeper_path + "/replicas/" + replica_name;
if (source_replica_path != replica_path && zookeeper->exists(source_replica_path + "/is_active") && !(zookeeper->get(source_replica_path + "/log_pointer").empty())) String source_log_pointer_raw = zookeeper->get(source_replica_path + "/log_pointer");
if ((source_replica_path != replica_path) && (!source_log_pointer_raw.empty()) && ("log-" + padIndex(parse<UInt64>(source_log_pointer_raw) >= entries[0]))
source_replica = replica_name; source_replica = replica_name;
} }
} }