Merge memory usage tracker into memory pool (#19434)

Summary: X-link: prestodb/presto#19434 - Merge the logic of memory usage tracker into memory pool and provide an option to disable it from the root memory pool - Simplify the memory exceeded error message generation - Cover the memory usage tracker tests in memory pool test - Remove the unused external memory reservation support which is previously added for Prestissimo Pull Request resolved: #4642 Test Plan: DPP test passed in five consecutive runs: f429919614 f429919571 f429919606 f429919595 f429919583 Has run on T10_5 test cluster overnight Reviewed By: oerling Differential Revision: D45061393 Pulled By: xiaoxmeng fbshipit-source-id: 00dd5b7ffcbedade8fe7278cdb3bce6739c40edf
facebookincubator · Apr 21, 2023 · e5c36ae · e5c36ae
1 parent ed40032
commit e5c36ae
Show file tree

Hide file tree

Showing 41 changed files with 1,644 additions and 2,529 deletions.
diff --git a/velox/buffer/tests/BufferTest.cpp b/velox/buffer/tests/BufferTest.cpp
@@ -27,6 +27,8 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+DECLARE_bool(velox_enable_memory_usage_track_in_default_memory_pool);
+
 namespace facebook {
 namespace velox {
 
@@ -40,6 +42,10 @@ static_assert(!Buffer::is_pod_like_v<std::shared_ptr<int>>, "");
 
 class BufferTest : public testing::Test {
  protected:
+  static void SetUpTestCase() {
+    FLAGS_velox_enable_memory_usage_track_in_default_memory_pool = true;
+  }
+
   void SetUp() override {
     pool_ = memoryManager_.addLeafPool("BufferTest");
   }

diff --git a/velox/common/memory/CMakeLists.txt b/velox/common/memory/CMakeLists.txt
@@ -25,10 +25,8 @@ add_library(
   MemoryAllocator.cpp
   MemoryArbitrator.cpp
   MemoryPool.cpp
-  MemoryUsage.cpp
   MmapAllocator.cpp
   MmapArena.cpp
-  MemoryUsageTracker.cpp
   StreamArena.cpp)
 
 target_link_libraries(

diff --git a/velox/common/memory/Memory.h b/velox/common/memory/Memory.h
@@ -40,7 +40,6 @@
 #include "velox/common/memory/Allocation.h"
 #include "velox/common/memory/MemoryAllocator.h"
 #include "velox/common/memory/MemoryPool.h"
-#include "velox/common/memory/MemoryUsage.h"
 
 DECLARE_int32(memory_usage_aggregation_interval_millis);
 DECLARE_bool(velox_memory_leak_check_enabled);

diff --git a/velox/common/memory/MemoryAllocator.h b/velox/common/memory/MemoryAllocator.h
@@ -27,7 +27,6 @@
 #include "velox/common/base/CheckedArithmetic.h"
 #include "velox/common/base/Exceptions.h"
 #include "velox/common/memory/Allocation.h"
-#include "velox/common/memory/MemoryUsageTracker.h"
 #include "velox/common/time/Timer.h"
 
 DECLARE_bool(velox_use_malloc);