Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix resource detection for unset CPU and memory limits in cgroup v2 #5267

Merged
merged 4 commits into from
Jul 23, 2024
Merged

Fix resource detection for unset CPU and memory limits in cgroup v2 #5267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65caeab
Fix resource detection for unset CPU and memory limits in cgroup v2
Jul 4, 2024
4f4f224
Small improvements
Jul 4, 2024
984a2c1
Build fixes
Jul 4, 2024
2ea06b2
Fixes to LinuxUtilizationParserCgroupV2.cs
Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion ...crosoft.Extensions.Diagnostics.ResourceMonitoring/Linux/LinuxUtilizationParserCgroupV2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,12 @@ public ulong GetAvailableMemoryInBytes()
_fileSystem.ReadAll(_memoryLimitInBytes, bufferWriter.Buffer);

ReadOnlySpan<char> memoryBuffer = bufferWriter.Buffer.WrittenSpan;

if (memoryBuffer.Equals("max\n", StringComparison.InvariantCulture))
{
return GetHostAvailableMemory();
}

_ = GetNextNumber(memoryBuffer, out maybeMemory);

if (maybeMemory == -1)
Expand Down Expand Up @@ -497,7 +503,13 @@ private static bool TryGetCpuUnitsFromCgroups(IFileSystem fileSystem, out float
return false;
}

int nextQuota = GetNextNumber(quotaBuffer, out long quota);
if (quotaBuffer.StartsWith("max", StringComparison.InvariantCulture))
{
cpuUnits = 0;
return false;
}

_ = GetNextNumber(quotaBuffer, out long quota);

if (quota == -1)
{
Expand Down
32 changes: 32 additions & 0 deletions ...ensions.Diagnostics.ResourceMonitoring.Tests/Linux/LinuxUtilizationParserCgroupV2Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,23 @@ public void When_Calling_GetMemoryUsageInBytes_Parser_Throws_When_UsageInBytes_D
Assert.Contains("/sys/fs/cgroup/memory.current", r.Message);
}

[ConditionalTheory]
[InlineData("max\n", 134_796_910_592ul)]
[InlineData("1000000\n", 1_000_000ul)]
public void When_Calling_GetAvailableMemoryInBytes_Parser_Returns_Available_Memory(string content, ulong expectedResult)
{
var f = new HardcodedValueFileSystem(new Dictionary<FileInfo, string>
{
{ new FileInfo("/sys/fs/cgroup/memory.max"), content },
{ new FileInfo("/proc/meminfo"), "MemTotal: 131637608 kB" }
});

var p = new LinuxUtilizationParserCgroupV2(f, new FakeUserHz(100));
var result = p.GetAvailableMemoryInBytes();

Assert.Equal(expectedResult, result);
}

[ConditionalTheory]
[InlineData("Suspicious12312312")]
[InlineData("string@")]
Expand Down Expand Up @@ -257,6 +274,21 @@ public void When_No_Cgroup_Cpu_Limits_Are_Not_Set_We_Get_Available_Cpus_From_Cpu
Assert.Equal(result, cpus);
}

[ConditionalFact]
public void When_Cpu_Max_Is_Set_To_Max_We_Get_Available_Cpus_From_CpuSetCpus()
{
var f = new HardcodedValueFileSystem(new Dictionary<FileInfo, string>
{
{ new FileInfo("/sys/fs/cgroup/cpuset.cpus.effective"), "0,1,2" },
{ new FileInfo("/sys/fs/cgroup/cpu.max"), "max 100000" },
});

var p = new LinuxUtilizationParserCgroupV2(f, new FakeUserHz(100));
var cpus = p.GetCgroupLimitedCpus();

Assert.Equal(3, cpus);
}

[ConditionalTheory]
[InlineData("-11")]
[InlineData("0-")]
Expand Down