From f41bba57a546430ed2c3d3c5e97a599003a6889d Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Fri, 1 Apr 2016 02:49:31 +0300 Subject: [PATCH] Better [#METR-20691]. --- dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp index 2110bbab3f..c833df657c 100644 --- a/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp +++ b/dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp @@ -339,6 +339,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataMerger::mergePartsToTemporaryPart MergeTreeData::DataPartsVector & parts, const String & merged_name, MergeList::Entry & merge_entry, size_t aio_threshold, DiskSpaceMonitor::Reservation * disk_reservation) { + if (isCancelled()) + throw Exception("Cancelled merging parts", ErrorCodes::ABORTED); + merge_entry->num_parts = parts.size(); LOG_DEBUG(log, "Merging " << parts.size() << " parts: from " << parts.front()->name << " to " << parts.back()->name << " into " << merged_name);