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

Improve nodes/metric detection in RestNodesInfo 

Because one URI parameter can contain either nodeIds or a list of metrics,
the check to detect if this parameter is either a nodeId or a metric needs
to be more accurate.
This commit is contained in:
Alexander Reelsen 2014-01-09 12:44:05 +01:00
parent dbecc713d6
commit f7db7eb99e
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/elasticsearch/rest/action/admin/cluster/node/info/RestNodesInfoAction.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.rest.action.admin.cluster.node.info; package org.elasticsearch.rest.action.admin.cluster.node.info;
import com.google.common.collect.Sets;
import org.elasticsearch.action.ActionListener; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoRequest;
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse; import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
@ -43,6 +44,7 @@ import static org.elasticsearch.rest.RestRequest.Method.GET;
public class RestNodesInfoAction extends BaseRestHandler { public class RestNodesInfoAction extends BaseRestHandler {
private final SettingsFilter settingsFilter; private final SettingsFilter settingsFilter;
private final static Set<String> ALLOWED_METRICS = Sets.newHashSet("http", "jvm", "network", "os", "plugin", "process", "settings", "thread_pool", "transport");
@Inject @Inject
public RestNodesInfoAction(Settings settings, Client client, RestController controller, public RestNodesInfoAction(Settings settings, Client client, RestController controller,
@ -62,10 +64,20 @@ public class RestNodesInfoAction extends BaseRestHandler {
public void handleRequest(final RestRequest request, final RestChannel channel) { public void handleRequest(final RestRequest request, final RestChannel channel) {
String[] nodeIds; String[] nodeIds;
Set<String> metrics; Set<String> metrics;
// special case like /_nodes/fs (in this case fs are metrics and not the nodeId)
// special case like /_nodes/os (in this case os are metrics and not the nodeId)
// still, /_nodes/_local (or any other node id) should work and be treated as usual
// this means one must differentiate between allowed metrics and arbitrary node ids in the same place
if (request.hasParam("nodeId") && !request.hasParam("metrics")) { if (request.hasParam("nodeId") && !request.hasParam("metrics")) {
nodeIds = new String[] { "_all" }; Set<String> metricsOrNodeIds = Strings.splitStringByCommaToSet(request.param("nodeId", "_all"));
metrics = Strings.splitStringByCommaToSet(request.param("nodeId", "_all")); boolean isMetricsOnly = ALLOWED_METRICS.containsAll(metricsOrNodeIds);
if (isMetricsOnly) {
nodeIds = new String[] { "_all" };
metrics = metricsOrNodeIds;
} else {
nodeIds = metricsOrNodeIds.toArray(new String[]{});
metrics = Sets.newHashSet("_all");
}
} else { } else {
nodeIds = Strings.splitStringByCommaToArray(request.param("nodeId", "_all")); nodeIds = Strings.splitStringByCommaToArray(request.param("nodeId", "_all"));
metrics = Strings.splitStringByCommaToSet(request.param("metrics", "_all")); metrics = Strings.splitStringByCommaToSet(request.param("metrics", "_all"));