提交 eca407e6 编写于 作者: A Alexey Milovidov

Revert "dbms: fixed high CPU usage on failed INSERTs [#METR-12726]."

This reverts commit 49cf3bbd0d8af92a756b46039a7a52fa81992765.
上级 587820aa
......@@ -12,11 +12,6 @@ public:
MergeTreeBlockOutputStream(StorageMergeTree & storage_)
: storage(storage_) {}
void writePrefix()
{
storage.data.throwIfTooMuchParts();
}
void write(const Block & block)
{
auto part_blocks = storage.writer.splitBlockIntoParts(block);
......
......@@ -637,7 +637,6 @@ public:
* Если передано until - проснуться раньше, если наступило событие.
*/
void delayInsertIfNeeded(Poco::Event * until = nullptr);
void throwIfTooMuchParts();
/** Возвращает активный кусок с указанным именем или кусок, покрывающий его. Если такого нет, возвращает nullptr.
*/
......
......@@ -15,11 +15,6 @@ public:
: storage(storage_), insert_id(insert_id_), block_index(0),
log(&Logger::get(storage.data.getLogName() + " (Replicated OutputStream)")) {}
void writePrefix()
{
storage.data.throwIfTooMuchParts();
}
void write(const Block & block) override
{
assertSessionIsNotExpired();
......
......@@ -844,12 +844,6 @@ size_t MergeTreeData::getMaxPartsCountForMonth()
return res;
}
void MergeTreeData::throwIfTooMuchParts()
{
ProfileEvents::increment(ProfileEvents::RejectedInserts);
throw Exception("Too much parts. Merges are processing significantly slower than inserts.", ErrorCodes::TOO_MUCH_PARTS);
}
void MergeTreeData::delayInsertIfNeeded(Poco::Event * until)
{
size_t parts_count = getMaxPartsCountForMonth();
......@@ -859,7 +853,10 @@ void MergeTreeData::delayInsertIfNeeded(Poco::Event * until)
delay /= 1000;
if (delay > DBMS_MAX_DELAY_OF_INSERT)
delay = DBMS_MAX_DELAY_OF_INSERT;
{
ProfileEvents::increment(ProfileEvents::RejectedInserts);
throw Exception("Too much parts. Merges are processing significantly slower than inserts.", ErrorCodes::TOO_MUCH_PARTS);
}
ProfileEvents::increment(ProfileEvents::DelayedInserts);
ProfileEvents::increment(ProfileEvents::DelayedInsertsMilliseconds, delay * 1000);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册