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

Attempt to not interrupt merges when ZK session is reinitialized [#METR-22283].

Browse Source
This commit is contained in:
Alexey Milovidov 2016-08-02 21:33:55 +03:00
parent 441aaf6e1d
commit 6cf89fa915
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,6 +171,10 @@ void ReplicatedMergeTreeRestartingThread::run()
storage.remote_part_checker_endpoint_holder->cancel();
storage.remote_part_checker_endpoint_holder = nullptr;
storage.merger.cancel();
if (storage.unreplicated_merger)
storage.unreplicated_merger->cancel();
partialShutdown();
}
catch (...)
@ -211,10 +215,6 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
std::bind(&StorageReplicatedMergeTree::queueTask, &storage, std::placeholders::_1));
storage.queue_task_handle->wake();
storage.merger.uncancel();
if (storage.unreplicated_merger)
storage.unreplicated_merger->uncancel();
return true;
}
catch (...)
@ -362,10 +362,6 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown()
storage.alter_query_event->set();
storage.replica_is_active_node = nullptr;
storage.merger.cancel();
if (storage.unreplicated_merger)
storage.unreplicated_merger->cancel();
LOG_TRACE(log, "Waiting for threads to finish");
if (storage.is_leader_node)
{

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

@ -1162,7 +1162,7 @@ bool StorageReplicatedMergeTree::executeLogEntry(const LogEntry & entry, Backgro
if (!do_fetch)
{
merger.renameMergedTemporaryPart(parts, part, entry.new_part_name, &transaction);
zookeeper->multi(ops);
getZooKeeper()->multi(ops); /// After long merge, get fresh ZK handle, because previous session may be expired.
/** Удаление старых кусков из ZK и с диска делается отложенно - см. ReplicatedMergeTreeCleanupThread, clearOldParts.
*/