honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-19 19:35:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add heap used percentage to _cat/nodes.

Browse Source 
Closes #4020.
This commit is contained in:
Andrew Raines 2013-10-30 13:47:29 -05:00
parent b2e8ec2924
commit 256605f065
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/org/elasticsearch/rest/action/cat/RestNodesAction.java
View File

@ -41,6 +41,7 @@ import org.elasticsearch.rest.action.support.RestTable;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator; import java.util.Iterator;
import java.util.Locale;
import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.GET;
@ -122,9 +123,11 @@ public class RestNodesAction extends BaseRestHandler {
table.addCell("port"); table.addCell("port");
table.addCell("jdk"); table.addCell("jdk");
table.addCell("diskfree", "text-align:right;"); table.addCell("diskAvail", "text-align:right;");
table.addCell("heapmax", "text-align:right;"); table.addCell("heapUsed", "text-align:right;");
table.addCell("memmax", "text-align:right;"); table.addCell("heapMax", "text-align:right;");
table.addCell("heapRatio", "text-align:right;");
table.addCell("ramMax", "text-align:right;");
table.addCell("uptime", "text-align:right;"); table.addCell("uptime", "text-align:right;");
table.addCell("data/client"); table.addCell("data/client");
@ -135,6 +138,15 @@ public class RestNodesAction extends BaseRestHandler {
for (DiscoveryNode node : state.getState().nodes()) { for (DiscoveryNode node : state.getState().nodes()) {
NodeInfo info = nodesInfo.getNodesMap().get(node.id()); NodeInfo info = nodesInfo.getNodesMap().get(node.id());
NodeStats stats = nodesStats.getNodesMap().get(node.id()); NodeStats stats = nodesStats.getNodesMap().get(node.id());
long heapUsed = stats.getJvm().mem().heapUsed().bytes();
long heapMax = info.getJvm().mem().heapMax().bytes();
float heapRatio = -1.0f;
if (heapMax > 0) {
heapRatio = heapUsed / (heapMax * 1.0f);
}
long availableDisk = -1; long availableDisk = -1;
if (!(stats.getFs() == null)) { if (!(stats.getFs() == null)) {
@ -153,7 +165,9 @@ public class RestNodesAction extends BaseRestHandler {
table.addCell(((InetSocketTransportAddress) node.address()).address().getPort()); table.addCell(((InetSocketTransportAddress) node.address()).address().getPort());
table.addCell(info.getJvm().version()); table.addCell(info.getJvm().version());
table.addCell(availableDisk < 0 ? null : ByteSizeValue.parseBytesSizeValue(new Long(availableDisk).toString())); table.addCell(availableDisk < 0 ? null : ByteSizeValue.parseBytesSizeValue(new Long(availableDisk).toString()));
table.addCell(info.getJvm().mem().heapMax()); table.addCell(new ByteSizeValue(heapUsed));
table.addCell(new ByteSizeValue(heapMax));
table.addCell(heapRatio < 0 ? null : String.format(Locale.ROOT, "%.1f%%", heapRatio*100.0));
table.addCell(info.getOs().mem() == null ? null : info.getOs().mem().total()); // sigar fails to load in IntelliJ table.addCell(info.getOs().mem() == null ? null : info.getOs().mem().total()); // sigar fails to load in IntelliJ
table.addCell(stats.getJvm().uptime()); table.addCell(stats.getJvm().uptime());
table.addCell(node.clientNode() ? "c" : node.dataNode() ? "d" : null); table.addCell(node.clientNode() ? "c" : node.dataNode() ? "d" : null);