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

Fix background moves start

Browse Source
This commit is contained in:
alesapin 2020-10-20 14:27:50 +03:00
parent d126aa8a09
commit ce8ee01d75
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Storages/StorageMergeTree.cpp
View File

@ -108,8 +108,7 @@ void StorageMergeTree::startup()
try try
{ {
background_executor.start(); background_executor.start();
if (areBackgroundMovesNeeded()) startBackgroundMovesIfNeeded();
background_moves_executor.start();
} }
catch (...) catch (...)
{ {
@ -1465,7 +1464,8 @@ MutationCommands StorageMergeTree::getFirtsAlterMutationCommandsForPart(const Da
void StorageMergeTree::startBackgroundMovesIfNeeded() void StorageMergeTree::startBackgroundMovesIfNeeded()
{ {
background_moves_executor.start(); if (areBackgroundMovesNeeded())
background_moves_executor.start();
} }
} }

7
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -3483,9 +3483,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.
background_executor.start(); background_executor.start();
if (areBackgroundMovesNeeded()) startBackgroundMovesIfNeeded();
background_moves_executor.start();
} }
catch (...) catch (...)
{ {
@ -5984,7 +5982,8 @@ MutationCommands StorageReplicatedMergeTree::getFirtsAlterMutationCommandsForPar
void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded() void StorageReplicatedMergeTree::startBackgroundMovesIfNeeded()
{ {
background_moves_executor.start(); if (areBackgroundMovesNeeded())
background_moves_executor.start();
} }
} }