File tree Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -1829,6 +1829,17 @@ void TKikimrRunner::KikimrStart() {
1829
1829
endpoint += Sprintf (" :%d" , server.second ->GetPort ());
1830
1830
ActorSystem->Send (NNodeWhiteboard::MakeNodeWhiteboardServiceId (ActorSystem->NodeId ),
1831
1831
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
+ }
1832
1843
}
1833
1844
}
1834
1845
Original file line number Diff line number Diff line change @@ -706,11 +706,6 @@ class TNodeWhiteboardService : public TActorBootstrapped<TNodeWhiteboardService>
706
706
} else {
707
707
SystemStateInfo.ClearMemoryUsed ();
708
708
}
709
- if (memoryStats.HasHardLimit ()) {
710
- SystemStateInfo.SetMemoryLimit (memoryStats.GetHardLimit ());
711
- } else {
712
- SystemStateInfo.ClearMemoryLimit ();
713
- }
714
709
if (memoryStats.HasAllocatedMemory ()) {
715
710
SystemStateInfo.SetMemoryUsedInAlloc (memoryStats.GetAllocatedMemory ());
716
711
} else {
You can’t perform that action at this time.
0 commit comments