fix gtest with MemoryWriteBuffer, do not mute exception in Replicated…

…MergeMutateTaskBase
ClickHouse · Jun 18, 2023 · e3f892f · e3f892f
1 parent 2bbfa27
commit e3f892f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/Disks/tests/gtest_cascade_and_memory_write_buffer.cpp b/src/Disks/tests/gtest_cascade_and_memory_write_buffer.cpp
@@ -223,6 +223,7 @@ TEST(MemoryWriteBuffer, WriteAndReread)
         {
             MemoryWriteBuffer buf(s - 1);
             EXPECT_THROW(buf.write(data.data(), data.size()), MemoryWriteBuffer::CurrentBufferExhausted);
+            buf.finalize();
         }
     }
 

diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -295,7 +295,7 @@ void MergeTreeBackgroundExecutor<Queue>::routine(TaskRuntimeDataPtr item)
             {
                 ALLOW_ALLOCATIONS_IN_SCOPE;
                 /// An exception context is needed to proper delete write buffers without finalization
-                throw Exception(ErrorCodes::ABORTED, "Storage is about to be deleted. Done task as if it was aborted.");
+                throw Exception(ErrorCodes::ABORTED, "Storage is about to be deleted. Done active task as if it was aborted.");
             }
             catch (...)
             {

diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
@@ -119,9 +119,11 @@ bool ReplicatedMergeMutateTaskBase::executeStep()
                 }
             }
         }
-
     }
 
+    if (saved_exception)
+        std::rethrow_exception(saved_exception);
+
     return false;
 }