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

Changed the root rest endpoint ('/') to use cluster service 

Instead of issuing a redundant cluster state request.

Closes #7899
This commit is contained in:
uboness 2014-09-30 15:55:03 +02:00
parent e53b2eede7
commit ddbeb910be
1 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
src/main/java/org/elasticsearch/rest/action/main/RestMainAction.java
View File

@ -22,16 +22,13 @@ package org.elasticsearch.rest.action.main;
import org.apache.lucene.util.Constants; import org.apache.lucene.util.Constants;
import org.elasticsearch.Build; import org.elasticsearch.Build;
import org.elasticsearch.Version; import org.elasticsearch.Version;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.client.Client; import org.elasticsearch.client.Client;
import org.elasticsearch.cluster.ClusterName; import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterService;
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.unit.TimeValue;
import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.rest.*; import org.elasticsearch.rest.*;
import org.elasticsearch.rest.action.support.RestResponseListener;
import static org.elasticsearch.rest.RestRequest.Method.GET; import static org.elasticsearch.rest.RestRequest.Method.GET;
import static org.elasticsearch.rest.RestRequest.Method.HEAD; import static org.elasticsearch.rest.RestRequest.Method.HEAD;
@ -43,62 +40,57 @@ public class RestMainAction extends BaseRestHandler {
private final Version version; private final Version version;
private final ClusterName clusterName; private final ClusterName clusterName;
private final ClusterService clusterService;
@Inject @Inject
public RestMainAction(Settings settings, Version version, RestController controller, ClusterName clusterName, Client client) { public RestMainAction(Settings settings, Version version, RestController controller, ClusterName clusterName, Client client, ClusterService clusterService) {
super(settings, controller, client); super(settings, controller, client);
this.version = version; this.version = version;
this.clusterName = clusterName; this.clusterName = clusterName;
this.clusterService = clusterService;
controller.registerHandler(GET, "/", this); controller.registerHandler(GET, "/", this);
controller.registerHandler(HEAD, "/", this); controller.registerHandler(HEAD, "/", this);
} }
@Override @Override
public void handleRequest(final RestRequest request, final RestChannel channel, final Client client) { public void handleRequest(final RestRequest request, RestChannel channel, final Client client) throws Exception {
ClusterStateRequest clusterStateRequest = new ClusterStateRequest();
clusterStateRequest.listenerThreaded(false);
clusterStateRequest.masterNodeTimeout(TimeValue.timeValueMillis(0));
clusterStateRequest.local(true);
clusterStateRequest.clear().blocks(true);
client.admin().cluster().state(clusterStateRequest, new RestResponseListener<ClusterStateResponse>(channel) {
@Override
public RestResponse buildResponse(ClusterStateResponse response) throws Exception {
RestStatus status = RestStatus.OK;
if (response.getState().blocks().hasGlobalBlock(RestStatus.SERVICE_UNAVAILABLE)) {
status = RestStatus.SERVICE_UNAVAILABLE;
}
if (request.method() == RestRequest.Method.HEAD) {
return new BytesRestResponse(status);
}
XContentBuilder builder = channel.newBuilder(); RestStatus status = RestStatus.OK;
if (clusterService.state().blocks().hasGlobalBlock(RestStatus.SERVICE_UNAVAILABLE)) {
status = RestStatus.SERVICE_UNAVAILABLE;
}
if (request.method() == RestRequest.Method.HEAD) {
channel.sendResponse(new BytesRestResponse(status));
return;
}
// Default to pretty printing, but allow ?pretty=false to disable XContentBuilder builder = channel.newBuilder();
if (!request.hasParam("pretty")) {
builder.prettyPrint().lfAtEnd();
}
builder.startObject(); // Default to pretty printing, but allow ?pretty=false to disable
builder.field("status", status.getStatus()); if (!request.hasParam("pretty")) {
if (settings.get("name") != null) { builder.prettyPrint().lfAtEnd();
builder.field("name", settings.get("name")); }
}
builder.field("cluster_name", clusterName.value()); builder.startObject();
builder.startObject("version") builder.field("status", status.getStatus());
.field("number", version.number()) if (settings.get("name") != null) {
.field("build_hash", Build.CURRENT.hash()) builder.field("name", settings.get("name"));
.field("build_timestamp", Build.CURRENT.timestamp()) }
.field("build_snapshot", version.snapshot) builder.field("cluster_name", clusterName.value());
// We use the lucene version from lucene constants since builder.startObject("version")
// this includes bugfix release version as well and is already in .field("number", version.number())
// the right format. We can also be sure that the format is maitained .field("build_hash", Build.CURRENT.hash())
// since this is also recorded in lucene segments and has BW compat .field("build_timestamp", Build.CURRENT.timestamp())
.field("lucene_version", Constants.LUCENE_MAIN_VERSION) .field("build_snapshot", version.snapshot)
.endObject(); // We use the lucene version from lucene constants since
builder.field("tagline", "You Know, for Search"); // this includes bugfix release version as well and is already in
builder.endObject(); // the right format. We can also be sure that the format is maitained
return new BytesRestResponse(status, builder); // since this is also recorded in lucene segments and has BW compat
} .field("lucene_version", Constants.LUCENE_MAIN_VERSION)
}); .endObject();
builder.field("tagline", "You Know, for Search");
builder.endObject();
channel.sendResponse(new BytesRestResponse(status, builder));
} }
} }