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

Try fix strange terminate (#1329)

Browse Source 
* Tests: External: rename --use_http  => --no_http and fix

* Try fix strange terminate
This commit is contained in:
proller 2017-10-12 23:42:58 +03:00 committed by alexey-milovidov
parent 3a6705af0f
commit b993667156
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1975,6 +1975,13 @@ void StorageReplicatedMergeTree::becomeLeader()
if (shutdown_called)
return;
if (merge_selecting_thread.joinable())
{
LOG_INFO(log, "Deleting old leader");
is_leader_node = false; // exit trigger inside thread
merge_selecting_thread.join();
}
LOG_INFO(log, "Became leader");
is_leader_node = true;
merge_selecting_thread = std::thread(&StorageReplicatedMergeTree::mergeSelectingThread, this);