thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-22 17:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update ReplicatedMergeTreeCleanupThread.cpp

Browse Source
This commit is contained in:
Vadim 2018-08-27 15:16:52 +03:00 committed by GitHub
parent 22aa521884
commit c4e90d89f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dbms/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
View File

@ -143,13 +143,9 @@ void ReplicatedMergeTreeCleanupThread::clearOldLogs()
{
host_versions_inactive_replicas[replica] = host_stat.version;
log_pointers_lost_replicas[replica] = log_pointer_str;
min_inactive_log_pointer = std::min(min_saved_log_pointer, log_pointer);
min_inactive_log_pointer = std::min(min_inactive_log_pointer, log_pointer);
}
}
<<<<<<< HEAD
=======
/// Only to support old versions CH.
>>>>>>> 1c596db7c060ce7aceb927e58198b6aab5a0d2b9
else
{
++replicas_were_marked_is_lost;
@ -187,15 +183,9 @@ void ReplicatedMergeTreeCleanupThread::clearOldLogs()
if (ops.size() > 4 * zkutil::MULTI_BATCH_SIZE || i + 1 == entries.size())
{
<<<<<<< HEAD
/// we need to check this because the replica that was restored from one of the marked replicas does not copy a non-valid log_pointer.
for (auto host_version: host_versions_inactive_replicas)
ops.emplace_back(zkutil::makeCheckRequest(storage.zookeeper_path + "/replicas" + host_version.first + "/host", host_version.second));
=======
/// we need to check this because the replica that was restored from one of the marked replicas does not copy a non-valid log_pointer.
for (auto host_version: host_versions_inactive_replicas)
ops.emplace_back(zkutil::makeCheckRequest(storage.zookeeper_path + "/replicas" + host_version.first + "/host", host_version.second));
>>>>>>> 1c596db7c060ce7aceb927e58198b6aab5a0d2b9
/// Simultaneously with clearing the log, we check to see if replica was added since we received replicas list.
ops.emplace_back(zkutil::makeCheckRequest(storage.zookeeper_path + "/replicas", stat.version));