Run cluster info requests on local node

Author: nielsbauman

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.exists/10_basic.yml

@@ -17,9 +17,14 @@
   - is_true: ''
 ---
 "Test indices.exists with local flag":
+  - requires:
+      test_runner_features: ["allowed_warnings"]
+
   - do:
       indices.exists:
         index: test_index
         local: true
+      allowed_warnings:
+        - "the [?local] query parameter to this API has no effect, is now deprecated, and will be removed in a future version"
 
   - is_false: ''

server/src/internalClusterTest/java/org/elasticsearch/cluster/SimpleClusterStateIT.java

@@ -266,7 +266,6 @@ public void testLargeClusterStatePublishing() throws Exception {
             MappingMetadata mappingMetadata = client.admin()
                 .indices()
                 .prepareGetMappings(TEST_REQUEST_TIMEOUT, "test")
-                .setLocal(true)
                 .get()
                 .getMappings()
                 .get("test");

server/src/main/java/org/elasticsearch/action/admin/indices/get/GetIndexRequest.java

@@ -17,16 +17,12 @@
 import org.elasticsearch.common.util.ArrayUtils;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.rest.RestRequest;
-import org.elasticsearch.tasks.CancellableTask;
-import org.elasticsearch.tasks.Task;
-import org.elasticsearch.tasks.TaskId;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 
 /**
@@ -168,9 +164,4 @@ public void writeTo(StreamOutput out) throws IOException {
         out.writeBoolean(humanReadable);
         out.writeBoolean(includeDefaults);
     }
-
-    @Override
-    public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
-        return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers);
-    }
 }

server/src/main/java/org/elasticsearch/action/admin/indices/get/TransportGetIndexAction.java

@@ -63,8 +63,7 @@ public TransportGetIndexAction(
             threadPool,
             actionFilters,
             GetIndexRequest::new,
-            indexNameExpressionResolver,
-            GetIndexResponse::new
+            indexNameExpressionResolver
         );
         this.indicesService = indicesService;
         this.settingsFilter = settingsFilter;

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsRequest.java

@@ -13,12 +13,8 @@
 import org.elasticsearch.action.support.master.info.ClusterInfoRequest;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.tasks.CancellableTask;
-import org.elasticsearch.tasks.Task;
-import org.elasticsearch.tasks.TaskId;
 
 import java.io.IOException;
-import java.util.Map;
 
 public class GetMappingsRequest extends ClusterInfoRequest<GetMappingsRequest> {
 
@@ -34,9 +30,4 @@ public GetMappingsRequest(StreamInput in) throws IOException {
     public ActionRequestValidationException validate() {
         return null;
     }
-
-    @Override
-    public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
-        return new CancellableTask(id, type, action, "", parentTaskId, headers);
-    }
 }

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponse.java

@@ -9,15 +9,13 @@
 
 package org.elasticsearch.action.admin.indices.mapping.get;
 
-import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.cluster.metadata.MappingMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.collect.Iterators;
-import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.xcontent.ChunkedToXContentObject;
-import org.elasticsearch.index.mapper.MapperService;
+import org.elasticsearch.core.UpdateForV10;
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.ToXContent;
 
@@ -35,21 +33,6 @@ public GetMappingsResponse(Map<String, MappingMetadata> mappings) {
         this.mappings = mappings;
     }
 
-    GetMappingsResponse(StreamInput in) throws IOException {
-        super(in);
-        mappings = in.readImmutableMap(in.getTransportVersion().before(TransportVersions.V_8_0_0) ? i -> {
-            int mappingCount = i.readVInt();
-            assert mappingCount == 1 || mappingCount == 0 : "Expected 0 or 1 mappings but got " + mappingCount;
-            if (mappingCount == 1) {
-                String type = i.readString();
-                assert MapperService.SINGLE_MAPPING_NAME.equals(type) : "Expected type [_doc] but got [" + type + "]";
-                return new MappingMetadata(i);
-            } else {
-                return MappingMetadata.EMPTY_MAPPINGS;
-            }
-        } : i -> i.readBoolean() ? new MappingMetadata(i) : MappingMetadata.EMPTY_MAPPINGS);
-    }
-
     public Map<String, MappingMetadata> mappings() {
         return mappings;
     }
@@ -58,6 +41,11 @@ public Map<String, MappingMetadata> getMappings() {
         return mappings();
     }
 
+    /**
+     * NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC we must remain able to write these responses until
+     * we no longer need to support calling this action remotely.
+     */
+    @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT)
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         MappingMetadata.writeMappingMetadata(out, mappings);

server/src/main/java/org/elasticsearch/action/admin/indices/mapping/get/TransportGetMappingsAction.java

@@ -50,8 +50,7 @@ public TransportGetMappingsAction(
             threadPool,
             actionFilters,
             GetMappingsRequest::new,
-            indexNameExpressionResolver,
-            GetMappingsResponse::new
+            indexNameExpressionResolver
         );
         this.indicesService = indicesService;
     }

server/src/main/java/org/elasticsearch/action/support/local/LocalClusterStateRequest.java

@@ -50,7 +50,7 @@ protected LocalClusterStateRequest(StreamInput in) throws IOException {
     }
 
     @Override
-    public final void writeTo(StreamOutput out) throws IOException {
+    public void writeTo(StreamOutput out) throws IOException {
         TransportAction.localOnly();
     }
 

server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequest.java

@@ -12,15 +12,19 @@
 import org.elasticsearch.TransportVersions;
 import org.elasticsearch.action.IndicesRequest;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadRequest;
+import org.elasticsearch.action.support.local.LocalClusterStateRequest;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.core.UpdateForV10;
+import org.elasticsearch.tasks.CancellableTask;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.tasks.TaskId;
 
 import java.io.IOException;
+import java.util.Map;
 
-public abstract class ClusterInfoRequest<Request extends ClusterInfoRequest<Request>> extends MasterNodeReadRequest<Request>
+public abstract class ClusterInfoRequest<Request extends ClusterInfoRequest<Request>> extends LocalClusterStateRequest
     implements
         IndicesRequest.Replaceable {
 
@@ -37,18 +41,11 @@ public ClusterInfoRequest(TimeValue masterTimeout, IndicesOptions indicesOptions
         this.indicesOptions = indicesOptions;
     }
 
-    @Deprecated(forRemoval = true)
-    public ClusterInfoRequest() {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
-    }
-
-    // So subclasses can override the default indices options, if needed
-    @Deprecated(forRemoval = true)
-    protected ClusterInfoRequest(IndicesOptions indicesOptions) {
-        super(TRAPPY_IMPLICIT_DEFAULT_MASTER_NODE_TIMEOUT);
-        this.indicesOptions = indicesOptions;
-    }
-
+    /**
+     * NB prior to 9.0 this was a TransportMasterNodeReadAction so for BwC we must remain able to read these requests until
+     * we no longer need to support calling this action remotely.
+     */
+    @UpdateForV10(owner = UpdateForV10.Owner.DATA_MANAGEMENT)
     public ClusterInfoRequest(StreamInput in) throws IOException {
         super(in);
         indices = in.readStringArray();
@@ -59,13 +56,8 @@ public ClusterInfoRequest(StreamInput in) throws IOException {
     }
 
     @Override
-    public void writeTo(StreamOutput out) throws IOException {
-        super.writeTo(out);
-        out.writeStringArray(indices);
-        if (out.getTransportVersion().before(TransportVersions.V_8_0_0)) {
-            out.writeStringArray(Strings.EMPTY_ARRAY);
-        }
-        indicesOptions.writeIndicesOptions(out);
+    public Task createTask(long id, String type, String action, TaskId parentTaskId, Map<String, String> headers) {
+        return new CancellableTask(id, type, action, getDescription(), parentTaskId, headers);
     }
 
     @Override

server/src/main/java/org/elasticsearch/action/support/master/info/ClusterInfoRequestBuilder.java

@@ -8,20 +8,17 @@
  */
 package org.elasticsearch.action.support.master.info;
 
+import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.action.ActionType;
 import org.elasticsearch.action.support.IndicesOptions;
-import org.elasticsearch.action.support.master.MasterNodeReadOperationRequestBuilder;
 import org.elasticsearch.client.internal.ElasticsearchClient;
 import org.elasticsearch.common.util.ArrayUtils;
 
 public abstract class ClusterInfoRequestBuilder<
     Request extends ClusterInfoRequest<Request>,
     Response extends ActionResponse,
-    Builder extends ClusterInfoRequestBuilder<Request, Response, Builder>> extends MasterNodeReadOperationRequestBuilder<
-        Request,
-        Response,
-        Builder> {
+    Builder extends ClusterInfoRequestBuilder<Request, Response, Builder>> extends ActionRequestBuilder<Request, Response> {
 
     protected ClusterInfoRequestBuilder(ElasticsearchClient client, ActionType<Response> action, Request request) {
         super(client, action, request);