add version and master_node flags to cluster state

elastic · Feb 10, 2014 · e5f43a1 · e5f43a1
1 parent 152edd1
commit e5f43a1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/docs/reference/cluster/state.asciidoc b/docs/reference/cluster/state.asciidoc
@@ -27,10 +27,16 @@ $ curl -XGET 'http://localhost:9200/_cluster/state/{metrics}/{indices}'
 
 `metrics` can be a comma-separated list of
 
+`version`::
+    Shows the cluster state version.
+
+`master_node`::
+    Shows the elected `master_node` part of the response
+
 `nodes`::
     Shows the `nodes` part of the response
 
-`routing_table`:: 
+`routing_table`::
     Shows the `routing_table` part of the response. If you supply a comma separated list of indices, the returned output will only contain the indices listed.
 
 `metadata`::

diff --git a/src/main/java/org/elasticsearch/cluster/ClusterState.java b/src/main/java/org/elasticsearch/cluster/ClusterState.java
@@ -235,7 +235,11 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
         Set<String> metrics = Strings.splitStringByCommaToSet(params.param("metric", "_all"));
         boolean isAllMetricsOnly = metrics.size() == 1 && metrics.contains("_all");
 
-        if (isAllMetricsOnly || metrics.contains("nodes")) {
+        if (isAllMetricsOnly || metrics.contains("version")) {
+            builder.field("version", version);
+        }
+
+        if (isAllMetricsOnly || metrics.contains("master_node")) {
             builder.field("master_node", nodes().masterNodeId());
         }
 

diff --git a/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java b/src/main/java/org/elasticsearch/rest/action/admin/cluster/state/RestClusterStateAction.java
@@ -71,7 +71,7 @@ public void handleRequest(final RestRequest request, final RestChannel channel)
         Set<String> metrics = Strings.splitStringByCommaToSet(request.param("metric", "_all"));
         boolean isAllMetricsOnly = metrics.size() == 1 && metrics.contains("_all");
         if (!isAllMetricsOnly) {
-            clusterStateRequest.nodes(metrics.contains("nodes"));
+            clusterStateRequest.nodes(metrics.contains("nodes") || metrics.contains("master_node"));
             clusterStateRequest.routingTable(metrics.contains("routing_table"));
             clusterStateRequest.metaData(metrics.contains("metadata"));
             clusterStateRequest.blocks(metrics.contains("blocks"));