honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make memoryPools in JvmStats not nullable, default to empty list

This commit is contained in:
javanna 2016-09-06 16:19:10 +02:00 committed by Luca Cavanna
parent a33e4b1d76
commit e3f2af8384
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/org/elasticsearch/monitor/jvm/JvmStats.java
View File

@ -19,7 +19,6 @@
package org.elasticsearch.monitor.jvm;
import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.io.stream.Writeable;
@ -100,7 +99,7 @@ public class JvmStats implements Writeable, ToXContent {
gcMxBean.getCollectionCount(), gcMxBean.getCollectionTime());
}
GarbageCollectors garbageCollectors = new GarbageCollectors(collectors);
List<BufferPool> bufferPoolsList = null;
List<BufferPool> bufferPoolsList = Collections.emptyList();
try {
List<BufferPoolMXBean> bufferPools = ManagementFactory.getPlatformMXBeans(BufferPoolMXBean.class);
bufferPoolsList = new ArrayList<>(bufferPools.size());
@ -128,7 +127,7 @@ public class JvmStats implements Writeable, ToXContent {
private final Classes classes;
public JvmStats(long timestamp, long uptime, Mem mem, Threads threads, GarbageCollectors gc,
@Nullable List<BufferPool> bufferPools, Classes classes) {
List<BufferPool> bufferPools, Classes classes) {
this.timestamp = timestamp;
this.uptime = uptime;
this.mem = mem;
@ -144,11 +143,7 @@ public class JvmStats implements Writeable, ToXContent {
mem = new Mem(in);
threads = new Threads(in);
gc = new GarbageCollectors(in);
if (in.readBoolean()) {
bufferPools = in.readList(BufferPool::new);
} else {
bufferPools = null;
}
bufferPools = in.readList(BufferPool::new);
classes = new Classes(in);
}
@ -159,12 +154,7 @@ public class JvmStats implements Writeable, ToXContent {
mem.writeTo(out);
threads.writeTo(out);
gc.writeTo(out);
if (bufferPools == null) {
out.writeBoolean(false);
} else {
out.writeBoolean(true);
out.writeList(bufferPools);
}
out.writeList(bufferPools);
classes.writeTo(out);
}

3
core/src/test/java/org/elasticsearch/action/admin/cluster/node/stats/NodeStatsTests.java
View File

@ -41,6 +41,7 @@ import org.elasticsearch.transport.TransportStats;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@ -294,7 +295,7 @@ public class NodeStatsTests extends ESTestCase {
JvmStats.Classes classes = new JvmStats.Classes(randomPositiveLong(), randomPositiveLong(), randomPositiveLong());
jvmStats = frequently() ? new JvmStats(randomPositiveLong(), randomPositiveLong(), new JvmStats.Mem(randomPositiveLong(),
randomPositiveLong(), randomPositiveLong(), randomPositiveLong(), randomPositiveLong(), memoryPools), threads,
garbageCollectors, randomBoolean() ? null : bufferPoolList, classes) : null;
garbageCollectors, randomBoolean() ? Collections.emptyList() : bufferPoolList, classes) : null;
}
ThreadPoolStats threadPoolStats = null;
if (frequently()) {