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

fix race between mergeSelectingTask and queue reinitialization

Browse Source
This commit is contained in:
Alexander Tokmakov 2022-01-28 15:50:58 +03:00
parent 330987a64b
commit b3ddc601a5
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
View File

@ -209,6 +209,7 @@ bool ReplicatedMergeTreeRestartingThread::tryStartup()
storage.queue_updating_task->activateAndSchedule();
storage.mutations_updating_task->activateAndSchedule();
storage.mutations_finalizing_task->activateAndSchedule();
storage.merge_selecting_task->activateAndSchedule();
storage.cleanup_thread.start();
storage.part_check_thread.start();
@ -375,6 +376,7 @@ void ReplicatedMergeTreeRestartingThread::partialShutdown()
LOG_TRACE(log, "Waiting for threads to finish");
storage.merge_selecting_task->deactivate();
storage.queue_updating_task->deactivate();
storage.mutations_updating_task->deactivate();
storage.mutations_finalizing_task->deactivate();

7
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -3365,7 +3365,6 @@ void StorageReplicatedMergeTree::startBeingLeader()
LOG_INFO(log, "Became leader");
is_leader = true;
merge_selecting_task->activateAndSchedule();
}
void StorageReplicatedMergeTree::stopBeingLeader()
@ -3375,7 +3374,6 @@ void StorageReplicatedMergeTree::stopBeingLeader()
LOG_INFO(log, "Stopped being leader");
is_leader = false;
merge_selecting_task->deactivate();
}
ConnectionTimeouts StorageReplicatedMergeTree::getFetchPartHTTPTimeouts(ContextPtr local_context)
@ -4038,15 +4036,14 @@ void StorageReplicatedMergeTree::startup()
assert(prev_ptr == nullptr);
getContext()->getInterserverIOHandler().addEndpoint(data_parts_exchange_ptr->getId(replica_path), data_parts_exchange_ptr);
startBeingLeader();
/// In this thread replica will be activated.
restarting_thread.start();
/// Wait while restarting_thread finishing initialization
startup_event.wait();
/// Restarting thread has initialized replication queue, replica can become leader now
startBeingLeader();
startBackgroundMovesIfNeeded();
part_moves_between_shards_orchestrator.start();