fix

Signed-off-by: luohaha <[email protected]>
StarRocks · Jul 18, 2024 · 75827f4 · 75827f4
1 parent 4cf7dac
commit 75827f4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 11 deletions.
diff --git a/be/src/runtime/load_channel_mgr.cpp b/be/src/runtime/load_channel_mgr.cpp
@@ -140,8 +140,7 @@ void LoadChannelMgr::open(brpc::Controller* cntl, const PTabletWriterOpenRequest
             response->mutable_status()->set_status_code(TStatusCode::MEM_LIMIT_EXCEEDED);
             response->mutable_status()->add_error_msgs(
                     "memory limit exceeded, please reduce load frequency or increase config "
-                    "`load_process_max_memory_limit_percent` or `load_process_max_memory_limit_bytes` "
-                    "or add more BE nodes");
+                    "`load_process_max_memory_hard_limit_bytes` or add more BE nodes");
             return;
         }
     }

diff --git a/be/src/storage/delta_writer.cpp b/be/src/storage/delta_writer.cpp
@@ -427,8 +427,7 @@ Status DeltaWriter::write(const Chunk& chunk, const uint32_t* indexes, uint32_t
                                       config::load_process_max_memory_hard_limit_percent)) {
             return Status::MemoryLimitExceeded(
                     "memory limit exceeded, please reduce load frequency or increase config "
-                    "`load_process_max_memory_limit_percent` or `load_process_max_memory_limit_bytes` "
-                    "or add more BE nodes");
+                    "`load_process_max_memory_hard_limit_bytes` or add more BE nodes");
         }
         _reset_mem_table();
     }

diff --git a/be/src/storage/lake/delta_writer.cpp b/be/src/storage/lake/delta_writer.cpp
@@ -346,8 +346,7 @@ Status DeltaWriterImpl::write(const Chunk& chunk, const uint32_t* indexes, uint3
                                       config::load_process_max_memory_hard_limit_percent)) {
             return Status::MemoryLimitExceeded(
                     "memory limit exceeded, please reduce load frequency or increase config "
-                    "`load_process_max_memory_limit_percent` or `load_process_max_memory_limit_bytes` "
-                    "or add more BE nodes");
+                    "`load_process_max_memory_hard_limit_bytes` or add more BE nodes");
         }
         RETURN_IF_ERROR(reset_memtable());
     }

diff --git a/be/test/storage/utils_test.cpp b/be/test/storage/utils_test.cpp
@@ -47,12 +47,12 @@ TEST_F(TestUtils, test_valid_decimal) {
 TEST_F(TestUtils, test_is_tracker_hit_hard_limit) {
     std::unique_ptr<MemTracker> tracker = std::make_unique<MemTracker>(1000, "test", nullptr);
     tracker->consume(2000);
-    ASSERT_TRUE(!is_tracker_hit_hard_limit(tracker.get(), 30, 30));
-    ASSERT_TRUE(!is_tracker_hit_hard_limit(tracker.get(), 30, 40));
-    ASSERT_TRUE(!is_tracker_hit_hard_limit(tracker.get(), 30, 50));
+    ASSERT_TRUE(is_tracker_hit_hard_limit(tracker.get(), 30, 30));
+    ASSERT_TRUE(is_tracker_hit_hard_limit(tracker.get(), 30, 40));
+    ASSERT_TRUE(is_tracker_hit_hard_limit(tracker.get(), 30, 50));
     ASSERT_TRUE(!is_tracker_hit_hard_limit(tracker.get(), 30, 60));
-    ASSERT_TRUE(is_tracker_hit_hard_limit(tracker.get(), 30, 65));
-    ASSERT_TRUE(is_tracker_hit_hard_limit(tracker.get(), 30, 70));
+    ASSERT_TRUE(!is_tracker_hit_hard_limit(tracker.get(), 30, 65));
+    ASSERT_TRUE(!is_tracker_hit_hard_limit(tracker.get(), 30, 70));
 }
 
 } // namespace starrocks