|
|
@@ -39,7 +39,6 @@ import org.elasticsearch.cluster.health.ClusterIndexHealth;
|
|
|
import org.elasticsearch.cluster.metadata.IndexMetadata;
|
|
|
import org.elasticsearch.common.Strings;
|
|
|
import org.elasticsearch.common.Table;
|
|
|
-import org.elasticsearch.common.logging.DeprecationLogger;
|
|
|
import org.elasticsearch.common.settings.Settings;
|
|
|
import org.elasticsearch.common.time.DateFormatter;
|
|
|
import org.elasticsearch.common.unit.TimeValue;
|
|
|
@@ -67,8 +66,6 @@ import static org.elasticsearch.action.support.master.MasterNodeRequest.DEFAULT_
|
|
|
import static org.elasticsearch.rest.RestRequest.Method.GET;
|
|
|
|
|
|
public class RestIndicesAction extends AbstractCatAction {
|
|
|
- private static final DeprecationLogger DEPRECATION_LOGGER = DeprecationLogger.getLogger(RestIndicesAction.class);
|
|
|
- static final String LOCAL_DEPRECATED_MESSAGE = "The parameter [local] is deprecated and will be removed in a future release.";
|
|
|
|
|
|
private static final DateFormatter STRICT_DATE_TIME_FORMATTER = DateFormatter.forPattern("strict_date_time");
|
|
|
|
|
|
@@ -99,10 +96,6 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
public RestChannelConsumer doCatRequest(final RestRequest request, final NodeClient client) {
|
|
|
final String[] indices = Strings.splitStringByCommaToArray(request.param("index"));
|
|
|
final IndicesOptions indicesOptions = IndicesOptions.fromRequest(request, IndicesOptions.strictExpand());
|
|
|
- if (request.hasParam("local")) {
|
|
|
- DEPRECATION_LOGGER.deprecate("local", LOCAL_DEPRECATED_MESSAGE);
|
|
|
- }
|
|
|
- final boolean local = request.paramAsBoolean("local", false);
|
|
|
final TimeValue masterNodeTimeout = request.paramAsTime("master_timeout", DEFAULT_MASTER_NODE_TIMEOUT);
|
|
|
final boolean includeUnloadedSegments = request.paramAsBoolean("include_unloaded_segments", false);
|
|
|
|
|
|
@@ -114,7 +107,7 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
}
|
|
|
});
|
|
|
|
|
|
- sendGetSettingsRequest(indices, indicesOptions, local, masterNodeTimeout, client, new ActionListener<>() {
|
|
|
+ sendGetSettingsRequest(indices, indicesOptions, masterNodeTimeout, client, new ActionListener<>() {
|
|
|
@Override
|
|
|
public void onResponse(final GetSettingsResponse getSettingsResponse) {
|
|
|
final GroupedActionListener<ActionResponse> groupedListener = createGroupedListener(request, 4, listener);
|
|
|
@@ -136,9 +129,9 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
// index names with the same indices options that we used for the initial cluster state request (strictExpand).
|
|
|
sendIndicesStatsRequest(indices, subRequestIndicesOptions, includeUnloadedSegments, client,
|
|
|
ActionListener.wrap(groupedListener::onResponse, groupedListener::onFailure));
|
|
|
- sendClusterStateRequest(indices, subRequestIndicesOptions, local, masterNodeTimeout, client,
|
|
|
+ sendClusterStateRequest(indices, subRequestIndicesOptions, masterNodeTimeout, client,
|
|
|
ActionListener.wrap(groupedListener::onResponse, groupedListener::onFailure));
|
|
|
- sendClusterHealthRequest(indices, subRequestIndicesOptions, local, masterNodeTimeout, client,
|
|
|
+ sendClusterHealthRequest(indices, subRequestIndicesOptions, masterNodeTimeout, client,
|
|
|
ActionListener.wrap(groupedListener::onResponse, groupedListener::onFailure));
|
|
|
}
|
|
|
|
|
|
@@ -160,14 +153,12 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
*/
|
|
|
private void sendGetSettingsRequest(final String[] indices,
|
|
|
final IndicesOptions indicesOptions,
|
|
|
- final boolean local,
|
|
|
final TimeValue masterNodeTimeout,
|
|
|
final NodeClient client,
|
|
|
final ActionListener<GetSettingsResponse> listener) {
|
|
|
final GetSettingsRequest request = new GetSettingsRequest();
|
|
|
request.indices(indices);
|
|
|
request.indicesOptions(indicesOptions);
|
|
|
- request.local(local);
|
|
|
request.masterNodeTimeout(masterNodeTimeout);
|
|
|
request.names(IndexSettings.INDEX_SEARCH_THROTTLED.getKey());
|
|
|
|
|
|
@@ -176,7 +167,6 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
|
|
|
private void sendClusterStateRequest(final String[] indices,
|
|
|
final IndicesOptions indicesOptions,
|
|
|
- final boolean local,
|
|
|
final TimeValue masterNodeTimeout,
|
|
|
final NodeClient client,
|
|
|
final ActionListener<ClusterStateResponse> listener) {
|
|
|
@@ -184,7 +174,6 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
final ClusterStateRequest request = new ClusterStateRequest();
|
|
|
request.indices(indices);
|
|
|
request.indicesOptions(indicesOptions);
|
|
|
- request.local(local);
|
|
|
request.masterNodeTimeout(masterNodeTimeout);
|
|
|
|
|
|
client.admin().cluster().state(request, listener);
|
|
|
@@ -192,7 +181,6 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
|
|
|
private void sendClusterHealthRequest(final String[] indices,
|
|
|
final IndicesOptions indicesOptions,
|
|
|
- final boolean local,
|
|
|
final TimeValue masterNodeTimeout,
|
|
|
final NodeClient client,
|
|
|
final ActionListener<ClusterHealthResponse> listener) {
|
|
|
@@ -200,7 +188,6 @@ public class RestIndicesAction extends AbstractCatAction {
|
|
|
final ClusterHealthRequest request = new ClusterHealthRequest();
|
|
|
request.indices(indices);
|
|
|
request.indicesOptions(indicesOptions);
|
|
|
- request.local(local);
|
|
|
request.masterNodeTimeout(masterNodeTimeout);
|
|
|
|
|
|
client.admin().cluster().health(request, listener);
|