Allow to enable default allocator via config on start (#14372)

2 files changed, 6 insertions, 0 deletions

diff --git a/ydb/core/driver_lib/run/run.cpp b/ydb/core/driver_lib/run/run.cpp
index 45ec80cdae..fc111a854c 100644
--- a/ydb/core/driver_lib/run/run.cpp
+++ b/ydb/core/driver_lib/run/run.cpp
@@ -1057,6 +1057,11 @@ void TKikimrRunner::InitializeAllocator(const TKikimrRunConfig& runConfig) {
     for (const auto& a : allocConfig.GetParam()) {
         NMalloc::MallocInfo().SetParam(a.first.c_str(), a.second.c_str());
     }
+#if defined(ALLOW_DEFAULT_ALLOCATOR)
+    if (allocConfig.GetEnableDefaultAllocator()) {
+        NKikimr::UseDefaultAllocator();
+    }
+#endif
 }
 
 void TKikimrRunner::InitializeAppData(const TKikimrRunConfig& runConfig)
diff --git a/ydb/core/protos/alloc.proto b/ydb/core/protos/alloc.proto
index 9d73ab2183..696510da7b 100644
--- a/ydb/core/protos/alloc.proto
+++ b/ydb/core/protos/alloc.proto
@@ -4,4 +4,5 @@ option java_package = "ru.yandex.kikimr.proto";
 
 message TAllocatorConfig {
     map<string, string> Param = 1;
+    bool EnableDefaultAllocator = 2;
 };