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

Merge pull request #9938 from drewr/issue/6297/cat/npe 

_cat/nodes: Thread null handling through stats and info
This commit is contained in:
Drew Raines 2015-03-17 16:02:47 -07:00
parent ed7f6526b9 c7e638ad22
commit e49aa2dee8
1 changed files with 115 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,10 +35,32 @@ import org.elasticsearch.common.Table;
import org.elasticsearch.common.inject.Inject; import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings; import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.transport.InetSocketTransportAddress; import org.elasticsearch.common.transport.InetSocketTransportAddress;
import org.elasticsearch.index.cache.filter.FilterCacheStats;
import org.elasticsearch.index.cache.id.IdCacheStats;
import org.elasticsearch.index.cache.query.QueryCacheStats;
import org.elasticsearch.index.engine.SegmentsStats;
import org.elasticsearch.index.fielddata.FieldDataStats;
import org.elasticsearch.index.flush.FlushStats;
import org.elasticsearch.index.get.GetStats;
import org.elasticsearch.index.indexing.IndexingStats;
import org.elasticsearch.index.merge.MergeStats;
import org.elasticsearch.index.percolator.stats.PercolateStats;
import org.elasticsearch.index.refresh.RefreshStats;
import org.elasticsearch.index.search.stats.SearchStats;
import org.elasticsearch.index.suggest.stats.SuggestStats;
import org.elasticsearch.indices.NodeIndicesStats;
import org.elasticsearch.monitor.fs.FsStats;
import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.jvm.JvmStats;
import org.elasticsearch.monitor.os.OsInfo;
import org.elasticsearch.monitor.os.OsStats;
import org.elasticsearch.monitor.process.ProcessInfo;
import org.elasticsearch.monitor.process.ProcessStats;
import org.elasticsearch.rest.*; import org.elasticsearch.rest.*;
import org.elasticsearch.rest.action.support.RestActionListener; import org.elasticsearch.rest.action.support.RestActionListener;
import org.elasticsearch.rest.action.support.RestResponseListener; import org.elasticsearch.rest.action.support.RestResponseListener;
import org.elasticsearch.rest.action.support.RestTable; import org.elasticsearch.rest.action.support.RestTable;
import org.elasticsearch.search.suggest.completion.CompletionStats;
import java.util.Locale; import java.util.Locale;
@ -200,6 +222,16 @@ public class RestNodesAction extends AbstractCatAction {
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());
JvmInfo jvmInfo = info == null ? null : info.getJvm();
OsInfo osInfo = info == null ? null : info.getOs();
ProcessInfo processInfo = info == null ? null : info.getProcess();
JvmStats jvmStats = stats == null ? null : stats.getJvm();
FsStats fsStats = stats == null ? null : stats.getFs();
OsStats osStats = stats == null ? null : stats.getOs();
ProcessStats processStats = stats == null ? null : stats.getProcess();
NodeIndicesStats indicesStats = stats == null ? null : stats.getIndices();
table.startRow(); table.startRow();
table.addCell(fullId ? node.id() : Strings.substring(node.getId(), 0, 4)); table.addCell(fullId ? node.id() : Strings.substring(node.getId(), 0, 4));
@ -214,93 +246,107 @@ public class RestNodesAction extends AbstractCatAction {
table.addCell(node.getVersion().number()); table.addCell(node.getVersion().number());
table.addCell(info == null ? null : info.getBuild().hashShort()); table.addCell(info == null ? null : info.getBuild().hashShort());
table.addCell(info == null ? null : info.getJvm().version()); table.addCell(jvmInfo == null ? null : jvmInfo.version());
table.addCell(stats == null ? null : stats.getFs() == null ? null : stats.getFs().total().getAvailable()); table.addCell(fsStats == null ? null : fsStats.getTotal().getAvailable());
table.addCell(stats == null ? null : stats.getJvm().getMem().getHeapUsed()); table.addCell(jvmStats == null ? null : jvmStats.getMem().getHeapUsed());
table.addCell(stats == null ? null : stats.getJvm().getMem().getHeapUsedPrecent()); table.addCell(jvmStats == null ? null : jvmStats.getMem().getHeapUsedPrecent());
table.addCell(info == null ? null : info.getJvm().getMem().getHeapMax()); table.addCell(jvmInfo == null ? null : jvmInfo.getMem().getHeapMax());
table.addCell(stats == null ? null : stats.getOs().mem() == null ? null : stats.getOs().mem().used()); table.addCell(osStats == null ? null : osStats.getMem() == null ? null : osStats.getMem().used());
table.addCell(stats == null ? null : stats.getOs().mem() == null ? null : stats.getOs().mem().usedPercent()); table.addCell(osStats == null ? null : osStats.getMem() == null ? null : osStats.getMem().usedPercent());
table.addCell(info == null ? null : info.getOs().mem() == null ? null : info.getOs().mem().total()); // sigar fails to load in IntelliJ table.addCell(osInfo == null ? null : osInfo.getMem() == null ? null : osInfo.getMem().total()); // sigar fails to load in IntelliJ
table.addCell(stats == null ? null : stats.getProcess().getOpenFileDescriptors()); table.addCell(processStats == null ? null : processStats.getOpenFileDescriptors());
table.addCell(stats == null || info == null ? null : table.addCell(processStats == null || processInfo == null ? null :
calculatePercentage(stats.getProcess().getOpenFileDescriptors(), info.getProcess().getMaxFileDescriptors())); calculatePercentage(processStats.getOpenFileDescriptors(), processInfo.getMaxFileDescriptors()));
table.addCell(info == null ? null : info.getProcess().getMaxFileDescriptors()); table.addCell(processInfo == null ? null : processInfo.getMaxFileDescriptors());
table.addCell(stats == null ? null : stats.getOs() == null ? null : stats.getOs().getLoadAverage().length < 1 ? null : String.format(Locale.ROOT, "%.2f", stats.getOs().getLoadAverage()[0])); table.addCell(osStats == null ? null : osStats.getLoadAverage().length < 1 ? null : String.format(Locale.ROOT, "%.2f", osStats.getLoadAverage()[0]));
table.addCell(stats == null ? null : stats.getJvm().uptime()); table.addCell(jvmStats == null ? null : jvmStats.uptime());
table.addCell(node.clientNode() ? "c" : node.dataNode() ? "d" : "-"); table.addCell(node.clientNode() ? "c" : node.dataNode() ? "d" : "-");
table.addCell(masterId == null ? "x" : masterId.equals(node.id()) ? "*" : node.masterNode() ? "m" : "-"); table.addCell(masterId == null ? "x" : masterId.equals(node.id()) ? "*" : node.masterNode() ? "m" : "-");
table.addCell(node.name()); table.addCell(node.name());
table.addCell(stats == null ? null : stats.getIndices().getCompletion().getSize()); CompletionStats completionStats = indicesStats == null ? null : stats.getIndices().getCompletion();
table.addCell(completionStats == null ? null : completionStats.getSize());
table.addCell(stats == null ? null : stats.getIndices().getFieldData().getMemorySize()); FieldDataStats fdStats = indicesStats == null ? null : stats.getIndices().getFieldData();
table.addCell(stats == null ? null : stats.getIndices().getFieldData().getEvictions()); table.addCell(fdStats == null ? null : fdStats.getMemorySize());
table.addCell(fdStats == null ? null : fdStats.getEvictions());
table.addCell(stats == null ? null : stats.getIndices().getFilterCache().getMemorySize()); FilterCacheStats fcStats = indicesStats == null ? null : indicesStats.getFilterCache();
table.addCell(stats == null ? null : stats.getIndices().getFilterCache().getEvictions()); table.addCell(fcStats == null ? null : fcStats.getMemorySize());
table.addCell(fcStats == null ? null : fcStats.getEvictions());
table.addCell(stats == null ? null : stats.getIndices().getQueryCache().getMemorySize()); QueryCacheStats qcStats = indicesStats == null ? null : indicesStats.getQueryCache();
table.addCell(stats == null ? null : stats.getIndices().getQueryCache().getEvictions()); table.addCell(qcStats == null ? null : qcStats.getMemorySize());
table.addCell(stats == null ? null : stats.getIndices().getQueryCache().getHitCount()); table.addCell(qcStats == null ? null : qcStats.getEvictions());
table.addCell(stats == null ? null : stats.getIndices().getQueryCache().getMissCount()); table.addCell(qcStats == null ? null : qcStats.getHitCount());
table.addCell(qcStats == null ? null : qcStats.getMissCount());
table.addCell(stats == null ? null : stats.getIndices().getFlush().getTotal()); FlushStats flushStats = indicesStats == null ? null : indicesStats.getFlush();
table.addCell(stats == null ? null : stats.getIndices().getFlush().getTotalTime()); table.addCell(flushStats == null ? null : flushStats.getTotal());
table.addCell(flushStats == null ? null : flushStats.getTotalTime());
table.addCell(stats == null ? null : stats.getIndices().getGet().current()); GetStats getStats = indicesStats == null ? null : indicesStats.getGet();
table.addCell(stats == null ? null : stats.getIndices().getGet().getTime()); table.addCell(getStats == null ? null : getStats.current());
table.addCell(stats == null ? null : stats.getIndices().getGet().getCount()); table.addCell(getStats == null ? null : getStats.getTime());
table.addCell(stats == null ? null : stats.getIndices().getGet().getExistsTime()); table.addCell(getStats == null ? null : getStats.getCount());
table.addCell(stats == null ? null : stats.getIndices().getGet().getExistsCount()); table.addCell(getStats == null ? null : getStats.getExistsTime());
table.addCell(stats == null ? null : stats.getIndices().getGet().getMissingTime()); table.addCell(getStats == null ? null : getStats.getExistsCount());
table.addCell(stats == null ? null : stats.getIndices().getGet().getMissingCount()); table.addCell(getStats == null ? null : getStats.getMissingTime());
table.addCell(getStats == null ? null : getStats.getMissingCount());
table.addCell(stats == null ? null : stats.getIndices().getIdCache().getMemorySize()); IdCacheStats idCacheStats = indicesStats == null ? null : indicesStats.getIdCache();
table.addCell(idCacheStats == null ? null : idCacheStats.getMemorySize());
table.addCell(stats == null ? null : stats.getIndices().getIndexing().getTotal().getDeleteCurrent()); IndexingStats indexingStats = indicesStats == null ? null : indicesStats.getIndexing();
table.addCell(stats == null ? null : stats.getIndices().getIndexing().getTotal().getDeleteTime()); table.addCell(indexingStats == null ? null : indexingStats.getTotal().getDeleteCurrent());
table.addCell(stats == null ? null : stats.getIndices().getIndexing().getTotal().getDeleteCount()); table.addCell(indexingStats == null ? null : indexingStats.getTotal().getDeleteTime());
table.addCell(stats == null ? null : stats.getIndices().getIndexing().getTotal().getIndexCurrent()); table.addCell(indexingStats == null ? null : indexingStats.getTotal().getDeleteCount());
table.addCell(stats == null ? null : stats.getIndices().getIndexing().getTotal().getIndexTime()); table.addCell(indexingStats == null ? null : indexingStats.getTotal().getIndexCurrent());
table.addCell(stats == null ? null : stats.getIndices().getIndexing().getTotal().getIndexCount()); table.addCell(indexingStats == null ? null : indexingStats.getTotal().getIndexTime());
table.addCell(indexingStats == null ? null : indexingStats.getTotal().getIndexCount());
table.addCell(stats == null ? null : stats.getIndices().getMerge().getCurrent()); MergeStats mergeStats = indicesStats == null ? null : indicesStats.getMerge();
table.addCell(stats == null ? null : stats.getIndices().getMerge().getCurrentNumDocs()); table.addCell(mergeStats == null ? null : mergeStats.getCurrent());
table.addCell(stats == null ? null : stats.getIndices().getMerge().getCurrentSize()); table.addCell(mergeStats == null ? null : mergeStats.getCurrentNumDocs());
table.addCell(stats == null ? null : stats.getIndices().getMerge().getTotal()); table.addCell(mergeStats == null ? null : mergeStats.getCurrentSize());
table.addCell(stats == null ? null : stats.getIndices().getMerge().getTotalNumDocs()); table.addCell(mergeStats == null ? null : mergeStats.getTotal());
table.addCell(stats == null ? null : stats.getIndices().getMerge().getTotalSize()); table.addCell(mergeStats == null ? null : mergeStats.getTotalNumDocs());
table.addCell(stats == null ? null : stats.getIndices().getMerge().getTotalTime()); table.addCell(mergeStats == null ? null : mergeStats.getTotalSize());
table.addCell(mergeStats == null ? null : mergeStats.getTotalTime());
table.addCell(stats == null ? null : stats.getIndices().getPercolate().getCurrent()); PercolateStats percolateStats = indicesStats == null ? null : indicesStats.getPercolate();
table.addCell(stats == null ? null : stats.getIndices().getPercolate().getMemorySize()); table.addCell(percolateStats == null ? null : percolateStats.getCurrent());
table.addCell(stats == null ? null : stats.getIndices().getPercolate().getNumQueries()); table.addCell(percolateStats == null ? null : percolateStats.getMemorySize());
table.addCell(stats == null ? null : stats.getIndices().getPercolate().getTime()); table.addCell(percolateStats == null ? null : percolateStats.getNumQueries());
table.addCell(stats == null ? null : stats.getIndices().getPercolate().getCount()); table.addCell(percolateStats == null ? null : percolateStats.getTime());
table.addCell(percolateStats == null ? null : percolateStats.getCount());
table.addCell(stats == null ? null : stats.getIndices().getRefresh().getTotal()); RefreshStats refreshStats = indicesStats == null ? null : indicesStats.getRefresh();
table.addCell(stats == null ? null : stats.getIndices().getRefresh().getTotalTime()); table.addCell(refreshStats == null ? null : refreshStats.getTotal());
table.addCell(refreshStats == null ? null : refreshStats.getTotalTime());
table.addCell(stats == null ? null : stats.getIndices().getSearch().getTotal().getFetchCurrent()); SearchStats searchStats = indicesStats == null ? null : indicesStats.getSearch();
table.addCell(stats == null ? null : stats.getIndices().getSearch().getTotal().getFetchTime()); table.addCell(searchStats == null ? null : searchStats.getTotal().getFetchCurrent());
table.addCell(stats == null ? null : stats.getIndices().getSearch().getTotal().getFetchCount()); table.addCell(searchStats == null ? null : searchStats.getTotal().getFetchTime());
table.addCell(stats == null ? null : stats.getIndices().getSearch().getOpenContexts()); table.addCell(searchStats == null ? null : searchStats.getTotal().getFetchCount());
table.addCell(stats == null ? null : stats.getIndices().getSearch().getTotal().getQueryCurrent()); table.addCell(searchStats == null ? null : searchStats.getOpenContexts());
table.addCell(stats == null ? null : stats.getIndices().getSearch().getTotal().getQueryTime()); table.addCell(searchStats == null ? null : searchStats.getTotal().getQueryCurrent());
table.addCell(stats == null ? null : stats.getIndices().getSearch().getTotal().getQueryCount()); table.addCell(searchStats == null ? null : searchStats.getTotal().getQueryTime());
table.addCell(searchStats == null ? null : searchStats.getTotal().getQueryCount());
table.addCell(stats == null ? null : stats.getIndices().getSegments().getCount()); SegmentsStats segmentsStats = indicesStats == null ? null : indicesStats.getSegments();
table.addCell(stats == null ? null : stats.getIndices().getSegments().getMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getCount());
table.addCell(stats == null ? null : stats.getIndices().getSegments().getIndexWriterMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getMemory());
table.addCell(stats == null ? null : stats.getIndices().getSegments().getIndexWriterMaxMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getIndexWriterMemory());
table.addCell(stats == null ? null : stats.getIndices().getSegments().getVersionMapMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getIndexWriterMaxMemory());
table.addCell(stats == null ? null : stats.getIndices().getSegments().getBitsetMemory()); table.addCell(segmentsStats == null ? null : segmentsStats.getVersionMapMemory());
table.addCell(segmentsStats == null ? null : segmentsStats.getBitsetMemory());
table.addCell(stats == null ? null : stats.getIndices().getSuggest().getCurrent()); SuggestStats suggestStats = indicesStats == null ? null : indicesStats.getSuggest();
table.addCell(stats == null ? null : stats.getIndices().getSuggest().getTime()); table.addCell(suggestStats == null ? null : suggestStats.getCurrent());
table.addCell(stats == null ? null : stats.getIndices().getSuggest().getCount()); table.addCell(suggestStats == null ? null : suggestStats.getTime());
table.addCell(suggestStats == null ? null : suggestStats.getCount());
table.endRow(); table.endRow();
} }