Always limit HardLimitBytes with MemTotal (#8223)

kunga · web-flow · commit 5b61f0cc7fe0 · 2024-08-23T17:32:48.000Z
diff --git a/ydb/core/memory_controller/memory_controller_config.h b/ydb/core/memory_controller/memory_controller_config.h
@@ -53,12 +53,15 @@ inline ui64 GetHardLimitBytes(const NKikimrConfig::TMemoryControllerConfig& conf
         if (info.CGroupLimit.has_value()) {
             hardLimitBytes = Min(hardLimitBytes, info.CGroupLimit.value());
         }
+        if (info.MemTotal.has_value()) {
+            hardLimitBytes = Min(hardLimitBytes, info.MemTotal.value());
+        }
         return hardLimitBytes;
     }
     if (info.CGroupLimit.has_value()) {
         return info.CGroupLimit.value();
     }
-    if (info.MemTotal) {
+    if (info.MemTotal.has_value()) {
         hasMemTotalHardLimit = true;
         return info.MemTotal.value();
     }

Original file line number	Diff line number	Diff line change
`@@ -53,12 +53,15 @@ inline ui64 GetHardLimitBytes(const NKikimrConfig::TMemoryControllerConfig& conf`
`53`	`53`	`if (info.CGroupLimit.has_value()) {`
`54`	`54`	`hardLimitBytes = Min(hardLimitBytes, info.CGroupLimit.value());`
`55`	`55`	`}`
	`56`	`+ if (info.MemTotal.has_value()) {`
	`57`	`+ hardLimitBytes = Min(hardLimitBytes, info.MemTotal.value());`
	`58`	`+ }`
`56`	`59`	`return hardLimitBytes;`
`57`	`60`	`}`
`58`	`61`	`if (info.CGroupLimit.has_value()) {`
`59`	`62`	`return info.CGroupLimit.value();`
`60`	`63`	`}`
`61`		`- if (info.MemTotal) {`
	`64`	`+ if (info.MemTotal.has_value()) {`
`62`	`65`	`hasMemTotalHardLimit = true;`
`63`	`66`	`return info.MemTotal.value();`
`64`	`67`	`}`