Expose min/max open file descriptors in Cluster Stats API
Also changes the response format of that section to: ``` "open_file_descriptors": { "min": 200, "max": 346, "avg": 273 } ``` Closes #4681 Note: this is an aggregate of 3 commits in the 0.90 branch
This commit is contained in:
parent
fcdafaddd9
commit
5ac7bd83ad
|
@ -110,7 +110,11 @@ Will return, for example:
|
||||||
"cpu": {
|
"cpu": {
|
||||||
"percent": 3
|
"percent": 3
|
||||||
},
|
},
|
||||||
"avg_open_file_descriptors": 218
|
"open_file_descriptors": {
|
||||||
|
"min": 200,
|
||||||
|
"max": 346,
|
||||||
|
"avg": 273
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"jvm": {
|
"jvm": {
|
||||||
"max_uptime": "24s",
|
"max_uptime": "24s",
|
||||||
|
|
|
@ -397,6 +397,8 @@ public class ClusterStatsNodes implements ToXContent, Streamable {
|
||||||
int count;
|
int count;
|
||||||
int cpuPercent;
|
int cpuPercent;
|
||||||
long totalOpenFileDescriptors;
|
long totalOpenFileDescriptors;
|
||||||
|
long minOpenFileDescriptors = Integer.MAX_VALUE;
|
||||||
|
long maxOpenFileDescriptors = Integer.MIN_VALUE;
|
||||||
|
|
||||||
public void addNodeStats(NodeStats nodeStats) {
|
public void addNodeStats(NodeStats nodeStats) {
|
||||||
if (nodeStats.getProcess() == null) {
|
if (nodeStats.getProcess() == null) {
|
||||||
|
@ -407,7 +409,10 @@ public class ClusterStatsNodes implements ToXContent, Streamable {
|
||||||
// with no sigar, this may not be available
|
// with no sigar, this may not be available
|
||||||
cpuPercent += nodeStats.getProcess().cpu().getPercent();
|
cpuPercent += nodeStats.getProcess().cpu().getPercent();
|
||||||
}
|
}
|
||||||
totalOpenFileDescriptors += nodeStats.getProcess().openFileDescriptors();
|
long fd = nodeStats.getProcess().openFileDescriptors();
|
||||||
|
totalOpenFileDescriptors += fd;
|
||||||
|
minOpenFileDescriptors = Math.min(minOpenFileDescriptors, fd);
|
||||||
|
maxOpenFileDescriptors = Math.max(maxOpenFileDescriptors, fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -424,11 +429,29 @@ public class ClusterStatsNodes implements ToXContent, Streamable {
|
||||||
return totalOpenFileDescriptors / count;
|
return totalOpenFileDescriptors / count;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public long getMaxOpenFileDescriptors() {
|
||||||
|
if (count == 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return maxOpenFileDescriptors;
|
||||||
|
}
|
||||||
|
|
||||||
|
public long getMinOpenFileDescriptors() {
|
||||||
|
if (count == 0) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
return minOpenFileDescriptors;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void readFrom(StreamInput in) throws IOException {
|
public void readFrom(StreamInput in) throws IOException {
|
||||||
count = in.readVInt();
|
count = in.readVInt();
|
||||||
cpuPercent = in.readVInt();
|
cpuPercent = in.readVInt();
|
||||||
totalOpenFileDescriptors = in.readVLong();
|
totalOpenFileDescriptors = in.readVLong();
|
||||||
|
if (in.getVersion().onOrAfter(Version.V_0_90_10)) {
|
||||||
|
minOpenFileDescriptors = in.readLong();
|
||||||
|
maxOpenFileDescriptors = in.readLong();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -436,6 +459,10 @@ public class ClusterStatsNodes implements ToXContent, Streamable {
|
||||||
out.writeVInt(count);
|
out.writeVInt(count);
|
||||||
out.writeVInt(cpuPercent);
|
out.writeVInt(cpuPercent);
|
||||||
out.writeVLong(totalOpenFileDescriptors);
|
out.writeVLong(totalOpenFileDescriptors);
|
||||||
|
if (out.getVersion().onOrAfter(Version.V_0_90_10)) {
|
||||||
|
out.writeLong(minOpenFileDescriptors);
|
||||||
|
out.writeLong(maxOpenFileDescriptors);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ProcessStats readStats(StreamInput in) throws IOException {
|
public static ProcessStats readStats(StreamInput in) throws IOException {
|
||||||
|
@ -447,13 +474,22 @@ public class ClusterStatsNodes implements ToXContent, Streamable {
|
||||||
static final class Fields {
|
static final class Fields {
|
||||||
static final XContentBuilderString CPU = new XContentBuilderString("cpu");
|
static final XContentBuilderString CPU = new XContentBuilderString("cpu");
|
||||||
static final XContentBuilderString PERCENT = new XContentBuilderString("percent");
|
static final XContentBuilderString PERCENT = new XContentBuilderString("percent");
|
||||||
static final XContentBuilderString AVG_OPEN_FD = new XContentBuilderString("avg_open_file_descriptors");
|
static final XContentBuilderString OPEN_FILE_DESCRIPTORS = new XContentBuilderString("open_file_descriptors");
|
||||||
|
static final XContentBuilderString MIN = new XContentBuilderString("min");
|
||||||
|
static final XContentBuilderString MAX = new XContentBuilderString("max");
|
||||||
|
static final XContentBuilderString AVG = new XContentBuilderString("avg");
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
|
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
|
||||||
builder.startObject(Fields.CPU).field(Fields.PERCENT, cpuPercent).endObject();
|
builder.startObject(Fields.CPU).field(Fields.PERCENT, cpuPercent).endObject();
|
||||||
builder.field(Fields.AVG_OPEN_FD, getAvgOpenFileDescriptors());
|
if (count > 0) {
|
||||||
|
builder.startObject(Fields.OPEN_FILE_DESCRIPTORS);
|
||||||
|
builder.field(Fields.MIN, getMinOpenFileDescriptors());
|
||||||
|
builder.field(Fields.MAX, getMaxOpenFileDescriptors());
|
||||||
|
builder.field(Fields.AVG, getAvgOpenFileDescriptors());
|
||||||
|
builder.endObject();
|
||||||
|
}
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,5 +136,9 @@ public class ClusterStatsTests extends ElasticsearchIntegrationTest {
|
||||||
assertThat(response.nodesStats.getVersions().contains(Version.CURRENT), Matchers.equalTo(true));
|
assertThat(response.nodesStats.getVersions().contains(Version.CURRENT), Matchers.equalTo(true));
|
||||||
assertThat(response.nodesStats.getPlugins().size(), Matchers.greaterThanOrEqualTo(0));
|
assertThat(response.nodesStats.getPlugins().size(), Matchers.greaterThanOrEqualTo(0));
|
||||||
|
|
||||||
|
assertThat(response.nodesStats.getProcess().getAvgOpenFileDescriptors(), Matchers.greaterThan(0L));
|
||||||
|
assertThat(response.nodesStats.getProcess().getMinOpenFileDescriptors(), Matchers.greaterThan(0L));
|
||||||
|
assertThat(response.nodesStats.getProcess().getMaxOpenFileDescriptors(), Matchers.greaterThan(0L));
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue