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

Merge pull request #49458 from ClickHouse/tavplubix-patch-6

Browse Source 
Follow-up to #48792
This commit is contained in:
Alexander Tokmakov 2023-05-04 14:32:18 +03:00 committed by GitHub
commit 36f8fcdfaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/StorageMergeTree.cpp
View File

@ -551,11 +551,11 @@ void StorageMergeTree::waitForMutation(Int64 version, const String & mutation_id
{
LOG_INFO(log, "Waiting mutation: {}", mutation_id);
{
auto check = [version, this]()
auto check = [version, wait_for_another_mutation, this]()
{
if (shutdown_called)
return true;
auto mutation_status = getIncompleteMutationsStatus(version);
auto mutation_status = getIncompleteMutationsStatus(version, nullptr, wait_for_another_mutation);
return !mutation_status || mutation_status->is_done || !mutation_status->latest_fail_reason.empty();
};