Skip to content

Commit 3653822

Browse files
committed
don't report fake limit as total node memory (#18120)
1 parent f8ccd84 commit 3653822

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

ydb/core/driver_lib/run/run.cpp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,6 +1829,17 @@ void TKikimrRunner::KikimrStart() {
18291829
endpoint += Sprintf(":%d", server.second->GetPort());
18301830
ActorSystem->Send(NNodeWhiteboard::MakeNodeWhiteboardServiceId(ActorSystem->NodeId),
18311831
new NNodeWhiteboard::TEvWhiteboard::TEvSystemStateAddEndpoint(server.first, endpoint));
1832+
if (ProcessMemoryInfoProvider) {
1833+
auto memInfo = ProcessMemoryInfoProvider->Get();
1834+
NKikimrWhiteboard::TSystemStateInfo systemStateInfo;
1835+
if (memInfo.CGroupLimit) {
1836+
systemStateInfo.SetMemoryLimit(*memInfo.CGroupLimit);
1837+
} else if (memInfo.MemTotal) {
1838+
systemStateInfo.SetMemoryLimit(*memInfo.MemTotal);
1839+
}
1840+
ActorSystem->Send(NNodeWhiteboard::MakeNodeWhiteboardServiceId(ActorSystem->NodeId),
1841+
new NNodeWhiteboard::TEvWhiteboard::TEvSystemStateUpdate(systemStateInfo));
1842+
}
18321843
}
18331844
}
18341845

ydb/core/tablet/node_whiteboard.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -706,11 +706,6 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
706706
} else {
707707
SystemStateInfo.ClearMemoryUsed();
708708
}
709-
if (memoryStats.HasHardLimit()) {
710-
SystemStateInfo.SetMemoryLimit(memoryStats.GetHardLimit());
711-
} else {
712-
SystemStateInfo.ClearMemoryLimit();
713-
}
714709
if (memoryStats.HasAllocatedMemory()) {
715710
SystemStateInfo.SetMemoryUsedInAlloc(memoryStats.GetAllocatedMemory());
716711
} else {

0 commit comments

Comments
 (0)