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

Merge pull request #10784 from ClickHouse/fix-queue-race-condition

Browse Source 
Fix race condition in ReplicatedMergeTreeQueue
This commit is contained in:
alexey-milovidov 2020-05-10 08:18:08 +03:00 committed by GitHub
commit 961603b111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -2954,6 +2954,7 @@ void StorageReplicatedMergeTree::startup()
/// If we don't separate create/start steps, race condition will happen /// If we don't separate create/start steps, race condition will happen
/// between the assignment of queue_task_handle and queueTask that use the queue_task_handle. /// between the assignment of queue_task_handle and queueTask that use the queue_task_handle.
{ {
auto lock = queue.lockQueue();
auto & pool = global_context.getBackgroundPool(); auto & pool = global_context.getBackgroundPool();
queue_task_handle = pool.createTask([this] { return queueTask(); }); queue_task_handle = pool.createTask([this] { return queueTask(); });
pool.startTask(queue_task_handle); pool.startTask(queue_task_handle);
@ -2993,7 +2994,6 @@ void StorageReplicatedMergeTree::shutdown()
queue_task_handle.reset(); queue_task_handle.reset();
} }
if (move_parts_task_handle) if (move_parts_task_handle)
global_context.getBackgroundMovePool().removeTask(move_parts_task_handle); global_context.getBackgroundMovePool().removeTask(move_parts_task_handle);
move_parts_task_handle.reset(); move_parts_task_handle.reset();