From 3922778db171cbac7bea11debb9f0a8883771a4f Mon Sep 17 00:00:00 2001 From: Leonardo Menezes Date: Tue, 24 Mar 2015 23:19:57 +0100 Subject: [PATCH 1/4] added node id column to _cat/shards response closes #10226 --- rest-api-spec/test/cat.shards/10_basic.yaml | 69 +++++++++++++++++++ .../rest/action/cat/RestShardsAction.java | 7 ++ 2 files changed, 76 insertions(+) diff --git a/rest-api-spec/test/cat.shards/10_basic.yaml b/rest-api-spec/test/cat.shards/10_basic.yaml index ce3145b83b5fa..8063bf3d04046 100755 --- a/rest-api-spec/test/cat.shards/10_basic.yaml +++ b/rest-api-spec/test/cat.shards/10_basic.yaml @@ -1,4 +1,73 @@ --- +"Help": + - do: + cat.shards: + help: true + + - match: + $body: | + /^ index .+ \n + shard .+ \n + prirep .+ \n + state .+ \n + docs .+ \n + store .+ \n + ip .+ \n + id .+ \n + node .+ \n + completion.size .+ \n + fielddata.memory_size .+ \n + fielddata.evictions .+ \n + filter_cache.memory_size .+ \n + filter_cache.evictions .+ \n + flush.total .+ \n + flush.total_time .+ \n + get.current .+ \n + get.time .+ \n + get.total .+ \n + get.exists_time .+ \n + get.exists_total .+ \n + get.missing_time .+ \n + get.missing_total .+ \n + id_cache.memory_size .+ \n + indexing.delete_current .+ \n + indexing.delete_time .+ \n + indexing.delete_total .+ \n + indexing.index_current .+ \n + indexing.index_time .+ \n + indexing.index_total .+ \n + merges.current .+ \n + merges.current_docs .+ \n + merges.current_size .+ \n + merges.total .+ \n + merges.total_docs .+ \n + merges.total_size .+ \n + merges.total_time .+ \n + percolate.current .+ \n + percolate.memory_size .+ \n + percolate.queries .+ \n + percolate.time .+ \n + percolate.total .+ \n + refresh.total .+ \n + refresh.time .+ \n + search.fetch_current .+ \n + search.fetch_time .+ \n + search.fetch_total .+ \n + search.open_contexts .+ \n + search.query_current .+ \n + search.query_time .+ \n + search.query_total .+ \n + segments.count .+ \n + segments.memory .+ \n + segments.index_writer_memory .+ \n + segments.index_writer_max_memory .+ \n + segments.version_map_memory .+ \n + segments.fixed_bitset_memory .+ \n + warmer.current .+ \n + warmer.total .+ \n + warmer.total_time .+ \n + $/ +--- "Test cat shards output": - do: diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java b/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java index 975416c70dbcc..0a32ac6771dec 100644 --- a/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java +++ b/src/main/java/org/elasticsearch/rest/action/cat/RestShardsAction.java @@ -86,6 +86,7 @@ Table getTableWithHeader(final RestRequest request) { .addCell("docs", "alias:d,dc;text-align:right;desc:number of docs in shard") .addCell("store", "alias:sto;text-align:right;desc:store size of shard (how much disk it uses)") .addCell("ip", "default:true;desc:ip of node where it lives") + .addCell("id", "default:false;desc:unique id of node where it lives") .addCell("node", "default:true;alias:n;desc:name of node where it lives"); table.addCell("completion.size", "alias:cs,completionSize;default:false;text-align:right;desc:size of completion"); @@ -186,21 +187,27 @@ private Table buildTable(RestRequest request, ClusterStateResponse state, Indice table.addCell(shardStats == null ? null : shardStats.getStore().getSize()); if (shard.assignedToNode()) { String ip = state.getState().nodes().get(shard.currentNodeId()).getHostAddress(); + String nodeId = shard.currentNodeId(); StringBuilder name = new StringBuilder(); name.append(state.getState().nodes().get(shard.currentNodeId()).name()); if (shard.relocating()) { String reloIp = state.getState().nodes().get(shard.relocatingNodeId()).getHostAddress(); String reloNme = state.getState().nodes().get(shard.relocatingNodeId()).name(); + String reloNodeId = shard.relocatingNodeId(); name.append(" -> "); name.append(reloIp); name.append(" "); + name.append(reloNodeId); + name.append(" "); name.append(reloNme); } table.addCell(ip); + table.addCell(nodeId); table.addCell(name); } else { table.addCell(null); table.addCell(null); + table.addCell(null); } table.addCell(shardStats == null ? null : shardStats.getCompletion().getSize()); From 15a43e752213102259cd00d2ce3c32caf94a9160 Mon Sep 17 00:00:00 2001 From: Leonardo Menezes Date: Tue, 24 Mar 2015 19:29:13 +0100 Subject: [PATCH 2/4] added node id column to _cat/segments response --- rest-api-spec/test/cat.segments/10_basic.yaml | 1 + .../org/elasticsearch/rest/action/cat/RestSegmentsAction.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/rest-api-spec/test/cat.segments/10_basic.yaml b/rest-api-spec/test/cat.segments/10_basic.yaml index 1de18fbcae1d6..b64d14ebd50d7 100755 --- a/rest-api-spec/test/cat.segments/10_basic.yaml +++ b/rest-api-spec/test/cat.segments/10_basic.yaml @@ -10,6 +10,7 @@ shard .+ \n prirep .+ \n ip .+ \n + id .+ \n segment .+ \n generation .+ \n docs.count .+ \n diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java index b2b42bd2d87f4..5c6a3e3bf1bf9 100644 --- a/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java +++ b/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java @@ -88,6 +88,7 @@ Table getTableWithHeader(RestRequest request) { table.addCell("shard", "default:true;alias:s,sh;desc:shard name"); table.addCell("prirep", "alias:p,pr,primaryOrReplica;default:true;desc:primary or replica"); table.addCell("ip", "default:true;desc:ip of node where it lives"); + table.addCell("id", "default:false;desc:unique id node where it lives"); table.addCell("segment", "default:true;alias:seg;desc:segment name"); table.addCell("generation", "default:true;alias:g,gen;text-align:right;desc:segment generation"); table.addCell("docs.count", "default:true;alias:dc,docsCount;text-align:right;desc:number of docs in segment"); @@ -123,6 +124,7 @@ private Table buildTable(final RestRequest request, ClusterStateResponse state, table.addCell(shardSegment.getShardId()); table.addCell(shardSegment.getShardRouting().primary() ? "p" : "r"); table.addCell(nodes.get(shardSegment.getShardRouting().currentNodeId()).getHostAddress()); + table.addCell(shardSegment.getShardRouting().currentNodeId()); table.addCell(segment.getName()); table.addCell(segment.getGeneration()); table.addCell(segment.getNumDocs()); From 93685bcf2a6edec95bedcd506c0f30a30f54591d Mon Sep 17 00:00:00 2001 From: Leonardo Menezes Date: Tue, 24 Mar 2015 23:51:09 +0100 Subject: [PATCH 3/4] added node id column to _cat/plugins response --- rest-api-spec/test/cat.plugins/10_basic.yaml | 16 ++++++++++++++++ .../rest/action/cat/RestPluginsAction.java | 2 ++ .../rest/action/cat/RestSegmentsAction.java | 2 +- 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 rest-api-spec/test/cat.plugins/10_basic.yaml diff --git a/rest-api-spec/test/cat.plugins/10_basic.yaml b/rest-api-spec/test/cat.plugins/10_basic.yaml new file mode 100644 index 0000000000000..bf974c8570323 --- /dev/null +++ b/rest-api-spec/test/cat.plugins/10_basic.yaml @@ -0,0 +1,16 @@ +--- +"Help": + - do: + cat.plugins: + help: true + + - match: + $body: | + /^ id .+ \n + name .+ \n + component .+ \n + version .+ \n + type .+ \n + url .+ \n + description .+ \n + $/ diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java index d104328fe74d9..3a9749fc088fd 100644 --- a/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java +++ b/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java @@ -77,6 +77,7 @@ public RestResponse buildResponse(final NodesInfoResponse nodesInfoResponse) thr Table getTableWithHeader(final RestRequest request) { Table table = new Table(); table.startHeaders(); + table.addCell("id", "alias:i;default:false;desc:unique node id"); table.addCell("name", "alias:n;desc:node name"); table.addCell("component", "alias:c;desc:component"); table.addCell("version", "alias:v;desc:component version"); @@ -96,6 +97,7 @@ private Table buildTable(RestRequest req, ClusterStateResponse state, NodesInfoR for (PluginInfo pluginInfo : info.getPlugins().getInfos()) { table.startRow(); + table.addCell(node.id()); table.addCell(node.name()); table.addCell(pluginInfo.getName()); table.addCell(pluginInfo.getVersion()); diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java b/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java index 5c6a3e3bf1bf9..0a9c02f4fd760 100644 --- a/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java +++ b/src/main/java/org/elasticsearch/rest/action/cat/RestSegmentsAction.java @@ -88,7 +88,7 @@ Table getTableWithHeader(RestRequest request) { table.addCell("shard", "default:true;alias:s,sh;desc:shard name"); table.addCell("prirep", "alias:p,pr,primaryOrReplica;default:true;desc:primary or replica"); table.addCell("ip", "default:true;desc:ip of node where it lives"); - table.addCell("id", "default:false;desc:unique id node where it lives"); + table.addCell("id", "default:false;desc:unique id of node where it lives"); table.addCell("segment", "default:true;alias:seg;desc:segment name"); table.addCell("generation", "default:true;alias:g,gen;text-align:right;desc:segment generation"); table.addCell("docs.count", "default:true;alias:dc,docsCount;text-align:right;desc:number of docs in segment"); From 85ee4580bdebb75eb567bc8b6fa514cf534a6bf0 Mon Sep 17 00:00:00 2001 From: Leonardo Menezes Date: Wed, 25 Mar 2015 11:26:17 +0100 Subject: [PATCH 4/4] removed _cat/plugins node id i alias --- .../org/elasticsearch/rest/action/cat/RestPluginsAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java b/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java index 3a9749fc088fd..3d0dda320e159 100644 --- a/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java +++ b/src/main/java/org/elasticsearch/rest/action/cat/RestPluginsAction.java @@ -77,7 +77,7 @@ public RestResponse buildResponse(final NodesInfoResponse nodesInfoResponse) thr Table getTableWithHeader(final RestRequest request) { Table table = new Table(); table.startHeaders(); - table.addCell("id", "alias:i;default:false;desc:unique node id"); + table.addCell("id", "default:false;desc:unique node id"); table.addCell("name", "alias:n;desc:node name"); table.addCell("component", "alias:c;desc:component"); table.addCell("version", "alias:v;desc:component version");