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

Return 0 for negative "free" and "total" memory reported by the OS #42725

Merged
merged 8 commits into from
Jun 19, 2019
Merged

Return 0 for negative "free" and "total" memory reported by the OS #42725

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d9e5581
Return 0 for negative "free" and "total" memory reported by the OS
dakrone May 30, 2019
1797f2c
Fix test passing in invalid memory value
dakrone May 30, 2019
2c86349
Fix another test passing in invalid memory value
dakrone May 30, 2019
9e86f99
Merge branch 'master' into reset-negative-mem-values
elasticmachine Jun 3, 2019
04b27ea
Also change mem check in MachineLearning.machineMemoryFromStats
dakrone Jun 14, 2019
929124d
Merge remote-tracking branch 'origin/master' into reset-negative-mem-…
dakrone Jun 14, 2019
2fad425
Add background documentation for why we prevent negative return values
dakrone Jun 14, 2019
6e87a2d
Clarify comment a bit more
dakrone Jun 17, 2019
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: 12 additions & 2 deletions server/src/main/java/org/elasticsearch/monitor/os/OsProbe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,12 @@ public long getFreePhysicalMemorySize() {
return -1;
}
try {
return (long) getFreePhysicalMemorySize.invoke(osMxBean);
final long freeMem = (long) getFreePhysicalMemorySize.invoke(osMxBean);
if (freeMem < 0) {
logger.warn("OS reported a negative free memory value [{}]", freeMem);
return 0;
}
return freeMem;
} catch (Exception e) {
return -1;
}
Expand All @@ -84,7 +89,12 @@ public long getTotalPhysicalMemorySize() {
return -1;
}
try {
return (long) getTotalPhysicalMemorySize.invoke(osMxBean);
final long totalMem = (long) getTotalPhysicalMemorySize.invoke(osMxBean);
if (totalMem < 0) {
logger.warn("OS reported a negative total memory value [{}]", totalMem);
return 0;
}
return totalMem;
} catch (Exception e) {
return -1;
}
Expand Down
4 changes: 4 additions & 0 deletions server/src/main/java/org/elasticsearch/monitor/os/OsStats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,17 @@ public static class Mem implements Writeable, ToXContentFragment {
private final long free;

public Mem(long total, long free) {
assert total >= 0 : "expected total memory to be positive, got: " + total;
assert free >= 0 : "expected free memory to be positive, got: " + total;
this.total = total;
this.free = free;
}

public Mem(StreamInput in) throws IOException {
this.total = in.readLong();
assert total >= 0 : "expected total memory to be positive, got: " + total;
this.free = in.readLong();
assert free >= 0 : "expected free memory to be positive, got: " + total;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,8 +797,8 @@ static long machineMemoryFromStats(OsStats stats) {
if (containerLimitStr != null) {
BigInteger containerLimit = new BigInteger(containerLimitStr);
if ((containerLimit.compareTo(BigInteger.valueOf(mem)) < 0 && containerLimit.compareTo(BigInteger.ZERO) > 0)
// mem < 0 means the value couldn't be obtained for some reason
|| (mem < 0 && containerLimit.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) < 0)) {
// mem <= 0 means the value couldn't be obtained for some reason
|| (mem <= 0 && containerLimit.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) < 0)) {
mem = containerLimit.longValue();
}
}
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/MachineLearningTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ public void testNoAttributes_givenClash() {

public void testMachineMemory_givenStatsFailure() throws IOException {
OsStats stats = mock(OsStats.class);
when(stats.getMem()).thenReturn(new OsStats.Mem(-1, -1));
assertEquals(-1L, MachineLearning.machineMemoryFromStats(stats));
when(stats.getMem()).thenReturn(new OsStats.Mem(0, 0));
assertEquals(0L, MachineLearning.machineMemoryFromStats(stats));
dakrone marked this conversation as resolved.
Show resolved Hide resolved
}

public void testMachineMemory_givenNoCgroup() throws IOException {
Expand Down
2 changes: 1 addition & 1 deletion ...t/java/org/elasticsearch/xpack/monitoring/collector/node/NodeStatsMonitoringDocTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ private static NodeStats mockNodeStats() {
final OsStats.Cgroup osCgroup = new OsStats.Cgroup("_cpu_acct_ctrl_group", ++iota, "_cpu_ctrl_group", ++iota, ++iota, osCpuStat,
"_memory_ctrl_group", "2000000000", "1000000000");

final OsStats.Mem osMem = new OsStats.Mem(no, no);
final OsStats.Mem osMem = new OsStats.Mem(0, 0);
final OsStats.Swap osSwap = new OsStats.Swap(no, no);
final OsStats os = new OsStats(no, osCpu, osMem, osSwap, osCgroup);

Expand Down