Cancel memory check when the ratio greater than 1.0 (#3289)

* Cancel memory check when the ratio greater than 1.0 * Comment Co-authored-by: Yichen Wang <[email protected]>
vesoft-inc · Nov 15, 2021 · be4d5bb · be4d5bb
1 parent 026dea5
commit be4d5bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/conf/nebula-graphd.conf.default b/conf/nebula-graphd.conf.default
@@ -79,7 +79,7 @@
 --auth_type=password
 
 ########## memory ##########
-# System memory high watermark ratio
+# System memory high watermark ratio, cancel the memory checking when the ratio greater than 1.0
 --system_memory_high_watermark_ratio=0.8
 
 ########## experimental feature ##########

diff --git a/conf/nebula-graphd.conf.production b/conf/nebula-graphd.conf.production
@@ -77,7 +77,7 @@
 --auth_type=password
 
 ########## memory ##########
-# System memory high watermark ratio
+# System memory high watermark ratio, cancel the memory checking when the ratio greater than 1.0
 --system_memory_high_watermark_ratio=0.8
 
 ########## experimental feature ##########

diff --git a/src/common/memory/MemoryUtils.cpp b/src/common/memory/MemoryUtils.cpp
@@ -27,6 +27,9 @@ static const std::regex reTotalCache(R"(^total_(cache|inactive_file)\s+(\d+)$)")
 std::atomic_bool MemoryUtils::kHitMemoryHighWatermark{false};
 
 StatusOr<bool> MemoryUtils::hitsHighWatermark() {
+  if (FLAGS_system_memory_high_watermark_ratio >= 1.0) {
+    return false;
+  }
   double available = 0.0, total = 0.0;
   if (FLAGS_containerized) {
     FileUtils::FileLineIterator iter("/sys/fs/cgroup/memory/memory.stat", &reTotalCache);