From 18c7abd018da8deaf6062c6e9096716846465648 Mon Sep 17 00:00:00 2001 From: Kaijie Chen Date: Fri, 28 Feb 2025 17:47:04 +0800 Subject: [PATCH 1/2] Revert "[fix](load) add null check for memtable after write failure reset (#47860)" This reverts commit 7490ea8e1797e4f8dd447c00922cb1e6598f89bd. --- be/src/olap/memtable_writer.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/be/src/olap/memtable_writer.cpp b/be/src/olap/memtable_writer.cpp index 1a0e1e99b69c9a..4e2dc75f2a20ee 100644 --- a/be/src/olap/memtable_writer.cpp +++ b/be/src/olap/memtable_writer.cpp @@ -168,11 +168,6 @@ Status MemTableWriter::flush_async() { return _cancel_status; } - // _mem_table may be null after write failure triggers reset - if (_mem_table == nullptr) { - return Status::OK(); - } - VLOG_NOTICE << "flush memtable to reduce mem consumption. memtable size: " << PrettyPrinter::print_bytes(_mem_table->memory_usage()) << ", tablet: " << _req.tablet_id << ", load id: " << print_id(_req.load_id); From aa9bb1b84b5657fe088cc34405908094a51d09fe Mon Sep 17 00:00:00 2001 From: Kaijie Chen Date: Fri, 28 Feb 2025 17:47:59 +0800 Subject: [PATCH 2/2] fix reset --- be/src/olap/memtable_writer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be/src/olap/memtable_writer.cpp b/be/src/olap/memtable_writer.cpp index 4e2dc75f2a20ee..b843f6c20f20da 100644 --- a/be/src/olap/memtable_writer.cpp +++ b/be/src/olap/memtable_writer.cpp @@ -116,7 +116,7 @@ Status MemTableWriter::write(const vectorized::Block* block, // thus preventing potential crashes if (!st.ok()) [[unlikely]] { std::lock_guard l(_mem_table_ptr_lock); - _mem_table.reset(); + _reset_mem_table(); return st; }