Merge remote-tracking branch 'elastic/7.x' into 7x-geoshape-doc-values

Author: talevy

benchmarks/build.gradle

@@ -41,7 +41,6 @@ dependencies {
   runtime 'org.apache.commons:commons-math3:3.2'
 }
 
-compileJava.options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked,-processing"
 // enable the JMH's BenchmarkProcessor to generate the final benchmark classes
 // needs to be added separately otherwise Gradle will quote it and javac will fail
 compileJava.options.compilerArgs.addAll(["-processor", "org.openjdk.jmh.generators.BenchmarkProcessor"])

client/client-benchmark-noop-api-plugin/build.gradle

@@ -33,8 +33,6 @@ assemble.enabled = false
 dependencyLicenses.enabled = false
 dependenciesInfo.enabled = false
 
-compileJava.options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked"
-
 // no unit tests
 test.enabled = false
 integTest.enabled = false

docs/reference/ingest/apis/enrich/get-enrich-policy.asciidoc

@@ -50,7 +50,7 @@ GET /_enrich/policy/my-policy
 [[get-enrich-policy-api-request]]
 ==== {api-request-title}
 
-`GET /_enrich/policy/<enrich-policy>`
+`GET /_enrich/policy/<name>`
 
 `GET /_enrich/policy`
 
@@ -66,7 +66,7 @@ include::put-enrich-policy.asciidoc[tag=enrich-policy-api-prereqs]
 [[get-enrich-policy-api-path-params]]
 ==== {api-path-parms-title}
 
-`<enrich-policy>`::
+`<name>`::
 +
 --
 (Optional, string)

docs/reference/modules/threadpool.asciidoc

@@ -20,8 +20,8 @@ There are several thread pools, but the important ones include:
     `1000`.
 
 [[search-throttled]]`search_throttled`::
-    For count/search/suggest/get operations on `search_throttled indices`. 
-    Thread pool type is `fixed_auto_queue_size` with a size of `1`, and initial 
+    For count/search/suggest/get operations on `search_throttled indices`.
+    Thread pool type is `fixed_auto_queue_size` with a size of `1`, and initial
     queue_size of `100`.
 
 `get`::
@@ -30,7 +30,7 @@ There are several thread pools, but the important ones include:
     queue_size of `1000`.
 
 `analyze`::
-    For analyze requests. Thread pool type is `fixed` with a size of `1`, queue 
+    For analyze requests. Thread pool type is `fixed` with a size of `1`, queue
     size of `16`.
 
 `write`::
@@ -51,8 +51,8 @@ There are several thread pools, but the important ones include:
     keep-alive of `5m` and a max of `min(10, (# of available processors)/2)`.
 
 `listener`::
-    Mainly for java client executing of action when listener threaded is set to 
-    `true`. Thread pool type is `scaling` with a default max of 
+    Mainly for java client executing of action when listener threaded is set to
+    `true`. Thread pool type is `scaling` with a default max of
     `min(10, (# of available processors)/2)`.
 
 `fetch_shard_started`::
@@ -125,6 +125,9 @@ thread_pool:
 
 experimental[]
 
+deprecated[7.7.0,The experimental `fixed_auto_queue_size` thread pool type is
+deprecated and will be removed in 8.0.]
+
 The `fixed_auto_queue_size` thread pool holds a fixed size of threads to handle
 the requests with a bounded queue for pending requests that have no threads to
 service them. It's similar to the `fixed` threadpool, however, the `queue_size`
@@ -202,13 +205,13 @@ processors: 2
 There are a few use-cases for explicitly overriding the `processors`
 setting:
 
-. If you are running multiple instances of {es} on the same host but want {es} 
-to size its thread pools as if it only has a fraction of the CPU, you should 
-override the `processors` setting to the desired fraction, for example, if 
+. If you are running multiple instances of {es} on the same host but want {es}
+to size its thread pools as if it only has a fraction of the CPU, you should
+override the `processors` setting to the desired fraction, for example, if
 you're running two instances of {es} on a 16-core machine, set `processors` to 8.
-Note that this is an expert-level use case and there's a lot more involved 
-than just setting the `processors` setting as there are other considerations 
-like changing the number of garbage collector threads, pinning processes to 
+Note that this is an expert-level use case and there's a lot more involved
+than just setting the `processors` setting as there are other considerations
+like changing the number of garbage collector threads, pinning processes to
 cores, and so on.
 . Sometimes the number of processors is wrongly detected and in such
 cases explicitly setting the `processors` setting will workaround such

modules/transport-netty4/build.gradle

@@ -33,8 +33,6 @@ esplugin {
   hasClientJar = true
 }
 
-compileTestJava.options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked"
-
 dependencies {
   // network stack
   compile "io.netty:netty-buffer:${versions.netty}"

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpClient.java

@@ -102,8 +102,7 @@ public Collection<FullHttpResponse> get(SocketAddress remoteAddress, String... u
         return sendRequests(remoteAddress, requests);
     }
 
-    @SafeVarargs // Safe not because it doesn't do anything with the type parameters but because it won't leak them into other methods.
-    public final Collection<FullHttpResponse> post(SocketAddress remoteAddress, Tuple<String, CharSequence>... urisAndBodies)
+    public final Collection<FullHttpResponse> post(SocketAddress remoteAddress, List<Tuple<String, CharSequence>> urisAndBodies)
         throws InterruptedException {
         return processRequestsWithBody(HttpMethod.POST, remoteAddress, urisAndBodies);
     }
@@ -114,15 +113,14 @@ public final FullHttpResponse post(SocketAddress remoteAddress, FullHttpRequest
         return responses.iterator().next();
     }
 
-    @SafeVarargs // Safe not because it doesn't do anything with the type parameters but because it won't leak them into other methods.
-    public final Collection<FullHttpResponse> put(SocketAddress remoteAddress, Tuple<String, CharSequence>... urisAndBodies)
+    public final Collection<FullHttpResponse> put(SocketAddress remoteAddress, List<Tuple<String, CharSequence>> urisAndBodies)
         throws InterruptedException {
         return processRequestsWithBody(HttpMethod.PUT, remoteAddress, urisAndBodies);
     }
 
-    private Collection<FullHttpResponse> processRequestsWithBody(HttpMethod method, SocketAddress remoteAddress, Tuple<String,
-        CharSequence>... urisAndBodies) throws InterruptedException {
-        Collection<HttpRequest> requests = new ArrayList<>(urisAndBodies.length);
+    private Collection<FullHttpResponse> processRequestsWithBody(HttpMethod method, SocketAddress remoteAddress, List<Tuple<String,
+        CharSequence>> urisAndBodies) throws InterruptedException {
+        Collection<HttpRequest> requests = new ArrayList<>(urisAndBodies.size());
         for (Tuple<String, CharSequence> uriAndBody : urisAndBodies) {
             ByteBuf content = Unpooled.copiedBuffer(uriAndBody.v2(), StandardCharsets.UTF_8);
             HttpRequest request = new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, method, uriAndBody.v1(), content);

modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4HttpRequestSizeLimitIT.java

@@ -33,7 +33,9 @@
 import org.elasticsearch.test.ESIntegTestCase.Scope;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
@@ -77,25 +79,23 @@ public void testLimitsInFlightRequests() throws Exception {
             bulkRequest.append(System.lineSeparator());
         }
 
-        @SuppressWarnings("unchecked")
-        Tuple<String, CharSequence>[] requests = new Tuple[150];
-        for (int i = 0; i < requests.length; i++) {
-            requests[i] = Tuple.tuple("/index/type/_bulk", bulkRequest);
+        List<Tuple<String, CharSequence>> requests = new ArrayList<>();
+        for (int i = 0; i < 150; i++) {
+            requests.add(Tuple.tuple("/index/type/_bulk", bulkRequest));
         }
 
         HttpServerTransport httpServerTransport = internalCluster().getInstance(HttpServerTransport.class);
-        TransportAddress transportAddress = (TransportAddress) randomFrom(httpServerTransport.boundAddress
-            ().boundAddresses());
+        TransportAddress transportAddress = randomFrom(httpServerTransport.boundAddress().boundAddresses());
 
         try (Netty4HttpClient nettyHttpClient = new Netty4HttpClient()) {
-            Collection<FullHttpResponse> singleResponse = nettyHttpClient.post(transportAddress.address(), requests[0]);
+            Collection<FullHttpResponse> singleResponse = nettyHttpClient.post(transportAddress.address(), requests.subList(0, 1));
             try {
                 assertThat(singleResponse, hasSize(1));
                 assertAtLeastOnceExpectedStatus(singleResponse, HttpResponseStatus.OK);
 
                 Collection<FullHttpResponse> multipleResponses = nettyHttpClient.post(transportAddress.address(), requests);
                 try {
-                    assertThat(multipleResponses, hasSize(requests.length));
+                    assertThat(multipleResponses, hasSize(requests.size()));
                     assertAtLeastOnceExpectedStatus(multipleResponses, HttpResponseStatus.TOO_MANY_REQUESTS);
                 } finally {
                     multipleResponses.forEach(ReferenceCounted::release);
@@ -109,21 +109,19 @@ public void testLimitsInFlightRequests() throws Exception {
     public void testDoesNotLimitExcludedRequests() throws Exception {
         ensureGreen();
 
-        @SuppressWarnings("unchecked")
-        Tuple<String, CharSequence>[] requestUris = new Tuple[1500];
-        for (int i = 0; i < requestUris.length; i++) {
-            requestUris[i] = Tuple.tuple("/_cluster/settings",
-                "{ \"transient\": {\"search.default_search_timeout\": \"40s\" } }");
+        List<Tuple<String, CharSequence>> requestUris = new ArrayList<>();
+        for (int i = 0; i < 1500; i++) {
+            requestUris.add(Tuple.tuple("/_cluster/settings",
+                "{ \"transient\": {\"search.default_search_timeout\": \"40s\" } }"));
         }
 
         HttpServerTransport httpServerTransport = internalCluster().getInstance(HttpServerTransport.class);
-        TransportAddress transportAddress = (TransportAddress) randomFrom(httpServerTransport.boundAddress
-            ().boundAddresses());
+        TransportAddress transportAddress = randomFrom(httpServerTransport.boundAddress().boundAddresses());
 
         try (Netty4HttpClient nettyHttpClient = new Netty4HttpClient()) {
             Collection<FullHttpResponse> responses = nettyHttpClient.put(transportAddress.address(), requestUris);
             try {
-                assertThat(responses, hasSize(requestUris.length));
+                assertThat(responses, hasSize(requestUris.size()));
                 assertAllInExpectedStatus(responses, HttpResponseStatus.OK);
             } finally {
                 responses.forEach(ReferenceCounted::release);

modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/Netty4TransportMultiPortIntegrationIT.java

@@ -37,6 +37,7 @@
 import org.elasticsearch.transport.Netty4Plugin;
 
 import java.net.InetAddress;
+import java.util.Arrays;
 import java.util.Locale;
 
 import static org.hamcrest.Matchers.allOf;
@@ -76,7 +77,7 @@ public void testThatTransportClientCanConnect() throws Exception {
             .put(Environment.PATH_HOME_SETTING.getKey(), createTempDir().toString())
             .build();
         // we have to test all the ports that the data node might be bound to
-        try (TransportClient transportClient = new MockTransportClient(settings, Netty4Plugin.class)) {
+        try (TransportClient transportClient = new MockTransportClient(settings, Arrays.asList(Netty4Plugin.class))) {
             for (int i = 0; i <= 10; i++) {
                 transportClient.addTransportAddress(new TransportAddress(InetAddress.getByName("127.0.0.1"), randomPort + i));
             }

modules/transport-netty4/src/test/java/org/elasticsearch/transport/netty4/Netty4TransportPublishAddressIT.java

@@ -76,7 +76,7 @@ public void testDifferentPorts() throws Exception {
                 assertThat(boundTransportAddress.boundAddresses().length, greaterThan(1));
                 for (TransportAddress boundAddress : boundTransportAddress.boundAddresses()) {
                     assertThat(boundAddress, instanceOf(TransportAddress.class));
-                    TransportAddress inetBoundAddress = (TransportAddress) boundAddress;
+                    TransportAddress inetBoundAddress = boundAddress;
                     if (inetBoundAddress.address().getAddress() instanceof Inet4Address) {
                         // IPv4 address is preferred publish address for _local_
                         assertThat(inetBoundAddress.getPort(), equalTo(boundTransportAddress.publishAddress().getPort()));

rest-api-spec/src/main/resources/rest-api-spec/api/delete_by_query.json

@@ -41,6 +41,10 @@
       ]
     },
     "params":{
+      "analyzer": {
+        "type" : "string",
+        "description" : "The analyzer to use for the query string"
+      },
       "analyze_wildcard": {
         "type" : "boolean",
         "description" : "Specify whether wildcard and prefix queries should be analyzed (default: false)"

rest-api-spec/src/main/resources/rest-api-spec/api/msearch_template.json

@@ -70,6 +70,11 @@
         "type" : "boolean",
         "description" : "Indicates whether hits.total should be rendered as an integer or an object in the rest search response",
         "default" : false
+      },
+      "ccs_minimize_roundtrips": {
+        "type" : "boolean",
+        "description" : "Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution",
+        "default" : "true"
       }
     },
     "body":{

rest-api-spec/src/main/resources/rest-api-spec/api/search_template.json

@@ -109,6 +109,11 @@
         "type":"boolean",
         "description":"Indicates whether hits.total should be rendered as an integer or an object in the rest search response",
         "default":false
+      },
+      "ccs_minimize_roundtrips": {
+        "type" : "boolean",
+        "description" : "Indicates whether network round-trips should be minimized as part of cross-cluster search requests execution",
+        "default" : "true"
       }
     },
     "body":{

server/src/main/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilder.java

@@ -67,11 +67,13 @@ public final class AutoQueueAdjustingExecutorBuilder extends ExecutorBuilder<Aut
         final String frameSizeKey = settingsKey(prefix, "auto_queue_frame_size");
         final String targetedResponseTimeKey = settingsKey(prefix, "target_response_time");
         this.targetedResponseTimeSetting = Setting.timeSetting(targetedResponseTimeKey, TimeValue.timeValueSeconds(1),
-                TimeValue.timeValueMillis(10), Setting.Property.NodeScope);
+                TimeValue.timeValueMillis(10), Setting.Property.NodeScope, Setting.Property.Deprecated);
         this.queueSizeSetting = Setting.intSetting(queueSizeKey, initialQueueSize, Setting.Property.NodeScope);
         // These temp settings are used to validate the min and max settings below
-        Setting<Integer> tempMaxQueueSizeSetting = Setting.intSetting(maxSizeKey, maxQueueSize, Setting.Property.NodeScope);
-        Setting<Integer> tempMinQueueSizeSetting = Setting.intSetting(minSizeKey, minQueueSize, Setting.Property.NodeScope);
+        Setting<Integer> tempMaxQueueSizeSetting = Setting.intSetting(maxSizeKey, maxQueueSize, Setting.Property.NodeScope,
+            Setting.Property.Deprecated);
+        Setting<Integer> tempMinQueueSizeSetting = Setting.intSetting(minSizeKey, minQueueSize, Setting.Property.NodeScope,
+            Setting.Property.Deprecated);
 
         this.minQueueSizeSetting = new Setting<>(
             minSizeKey,
@@ -126,8 +128,9 @@ public Iterator<Setting<?>> settings() {
                     }
 
                 },
-                Setting.Property.NodeScope);
-        this.frameSizeSetting = Setting.intSetting(frameSizeKey, frameSize, 100, Setting.Property.NodeScope);
+                Setting.Property.NodeScope, Setting.Property.Deprecated);
+        this.frameSizeSetting = Setting.intSetting(frameSizeKey, frameSize, 100, Setting.Property.NodeScope, Setting.Property.Deprecated,
+            Setting.Property.Deprecated);
     }
 
     @Override

server/src/test/java/org/elasticsearch/threadpool/AutoQueueAdjustingExecutorBuilderTests.java

@@ -78,6 +78,8 @@ public void testValidatingMinMaxSettings() {
         } catch (IllegalArgumentException e) {
             assertEquals(e.getMessage(), "Failed to parse value [100] for setting [thread_pool.test.min_queue_size] must be <= 99");
         }
+
+        assertSettingDeprecationsAndWarnings(new String[]{"thread_pool.test.max_queue_size"});
     }
 
     public void testSetLowerSettings() {
@@ -89,6 +91,8 @@ public void testSetLowerSettings() {
         AutoQueueAdjustingExecutorBuilder.AutoExecutorSettings s = test.getSettings(settings);
         assertEquals(10, s.maxQueueSize);
         assertEquals(10, s.minQueueSize);
+
+        assertSettingDeprecationsAndWarnings(new String[]{"thread_pool.test.min_queue_size", "thread_pool.test.max_queue_size"});
     }
 
     public void testSetHigherSettings() {
@@ -100,6 +104,8 @@ public void testSetHigherSettings() {
         AutoQueueAdjustingExecutorBuilder.AutoExecutorSettings s = test.getSettings(settings);
         assertEquals(3000, s.maxQueueSize);
         assertEquals(2000, s.minQueueSize);
+
+        assertSettingDeprecationsAndWarnings(new String[]{"thread_pool.test.min_queue_size", "thread_pool.test.max_queue_size"});
     }
 
 }

x-pack/plugin/src/test/resources/rest-api-spec/api/enrich.get_policy.json

@@ -11,8 +11,8 @@
           "methods": [ "GET" ],
           "parts": {
             "name": {
-              "type" : "string",
-              "description" : "The name of the enrich policy"
+              "type" : "list",
+              "description" : "A comma-separated list of enrich policy names"
             }
           }
         },

x-pack/plugin/src/test/resources/rest-api-spec/test/analytics/top_metrics.yml

@@ -112,6 +112,9 @@
 
 ---
 "sort by scaled float field":
+  - skip:
+      version: "all"
+      reason: "AwaitsFix https://github.com/elastic/elasticsearch/issues/52418"
   - do:
       indices.create:
         index: test

x-pack/qa/rolling-upgrade/build.gradle

@@ -10,8 +10,6 @@ dependencies {
   testCompile project(':client:rest-high-level')
 }
 
-compileTestJava.options.compilerArgs << "-Xlint:-cast,-rawtypes,-unchecked"
-
 forbiddenPatterns {
   exclude '**/system_key'
 }

x-pack/qa/rolling-upgrade/src/test/java/org/elasticsearch/upgrades/TokenBackwardsCompatibilityIT.java

@@ -361,6 +361,7 @@ private void assertRefreshTokenInvalidated(String refreshToken) throws IOExcepti
         }
     }
 
+    @SuppressWarnings("unchecked")
     private Map<Version, RestClient> getRestClientByVersion() throws IOException {
         Response response = client().performRequest(new Request("GET", "_nodes"));
         assertOK(response);
@@ -404,6 +405,7 @@ private void storeTokens(RestClient client, int idx, String accessToken, String
         assertOK(indexResponse1);
     }
 
+    @SuppressWarnings("unchecked")
     private Map<String, Object> retrieveStoredTokens(RestClient client, int tokenIdx) throws IOException {
         Request getRequest = new Request("GET", "token_backwards_compatibility_it/_doc/old_cluster_token" + tokenIdx);
         Response getResponse = client().performRequest(getRequest);

x-pack/qa/third-party/active-directory/build.gradle

@@ -13,8 +13,6 @@ processTestResources {
   from(project(xpackModule('security')).sourceSets.test.resources.srcDirs)
 }
 
-compileTestJava.options.compilerArgs << "-Xlint:-rawtypes,-unchecked"
-
 // we have to repeat these patterns because the security test resources are effectively in the src of this p
 forbiddenPatterns {
   exclude '**/*.key'