Skip to content

Handle a max memory value of 'max' #77289

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

Merged
merged 3 commits into from
Sep 6, 2021
Merged

Handle a max memory value of 'max' #77289

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87951f9
Handle a max memory value of 'max'
pugnascotia Sep 5, 2021
7e82b4d
Update docs/changelog/77289.yaml
pugnascotia Sep 5, 2021
5c594c1
Delete 77289.yaml
pugnascotia Sep 6, 2021
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
7 changes: 5 additions & 2 deletions server/src/test/java/org/elasticsearch/monitor/os/OsProbeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,11 @@ public void testOsStats() {
assertThat(stats.getCgroup().getCpuStat().getTimeThrottledNanos(), greaterThanOrEqualTo(0L));
// These could be null if transported from a node running an older version, but shouldn't be null on the current node
assertThat(stats.getCgroup().getMemoryControlGroup(), notNullValue());
assertThat(stats.getCgroup().getMemoryLimitInBytes(), notNullValue());
assertThat(new BigInteger(stats.getCgroup().getMemoryLimitInBytes()), greaterThan(BigInteger.ZERO));
String memoryLimitInBytes = stats.getCgroup().getMemoryLimitInBytes();
assertThat(memoryLimitInBytes, notNullValue());
if (memoryLimitInBytes.equals("max") == false) {
assertThat(new BigInteger(memoryLimitInBytes), greaterThan(BigInteger.ZERO));
}
assertThat(stats.getCgroup().getMemoryUsageInBytes(), notNullValue());
assertThat(new BigInteger(stats.getCgroup().getMemoryUsageInBytes()), greaterThan(BigInteger.ZERO));
}
Expand Down