mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-14 03:25:15 +00:00
fix gtest with MemoryWriteBuffer, do not mute exception in ReplicatedMergeMutateTaskBase
This commit is contained in:
parent
2bbfa279ec
commit
e3f892f84a
@ -223,6 +223,7 @@ TEST(MemoryWriteBuffer, WriteAndReread)
|
||||
{
|
||||
MemoryWriteBuffer buf(s - 1);
|
||||
EXPECT_THROW(buf.write(data.data(), data.size()), MemoryWriteBuffer::CurrentBufferExhausted);
|
||||
buf.finalize();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -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 (...)
|
||||
{
|
||||
|
@ -119,9 +119,11 @@ bool ReplicatedMergeMutateTaskBase::executeStep()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if (saved_exception)
|
||||
std::rethrow_exception(saved_exception);
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user