diff --git a/README.textile b/README.textile
index c964e31655dc8..ce7b3b7d34476 100644
--- a/README.textile
+++ b/README.textile
@@ -27,7 +27,6 @@ Elasticsearch is a distributed RESTful search engine built for the cloud. Featur
** All the power of Lucene easily exposed through simple configuration / plugins.
* Per operation consistency
** Single document level operations are atomic, consistent, isolated and durable.
-* Open Source under the Apache License, version 2 ("ALv2")
h2. Getting Started
@@ -217,23 +216,3 @@ Elasticsearch (1.x), it is required to perform a full cluster restart. Please
see the "setup reference":
https://www.elastic.co/guide/en/elasticsearch/reference/current/setup-upgrade.html
for more details on the upgrade process.
-
-h1. License
-
-
-This software is licensed under the Apache License, version 2 ("ALv2"), quoted below.
-
-Copyright 2009-2016 Elasticsearch
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations under
-the License.
-
diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
index 6043ce210906a..5eb82c12616fc 100644
--- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
@@ -475,14 +475,18 @@ class BuildPlugin implements Plugin {
}
static void configureJavadoc(Project project) {
- project.tasks.withType(Javadoc) {
- executable = new File(project.compilerJavaHome, 'bin/javadoc')
+ // remove compiled classes from the Javadoc classpath: http://mail.openjdk.java.net/pipermail/javadoc-dev/2018-January/000400.html
+ final List classes = new ArrayList<>()
+ project.tasks.withType(JavaCompile) { javaCompile ->
+ classes.add(javaCompile.destinationDir)
}
- configureJavadocJar(project)
- if (project.compilerJavaVersion == JavaVersion.VERSION_1_10) {
- project.tasks.withType(Javadoc) { it.enabled = false }
- project.tasks.getByName('javadocJar').each { it.enabled = false }
+ project.tasks.withType(Javadoc) { javadoc ->
+ javadoc.executable = new File(project.compilerJavaHome, 'bin/javadoc')
+ javadoc.classpath = javadoc.getClasspath().filter { f ->
+ return classes.contains(f) == false
+ }
}
+ configureJavadocJar(project)
}
/** Adds a javadocJar task to generate a jar containing javadocs. */
diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
index 0b366aa99e188..f5b46a6a53192 100644
--- a/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
+++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/IndicesClient.java
@@ -34,15 +34,17 @@
import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
+import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeRequest;
+import org.elasticsearch.action.admin.indices.forcemerge.ForceMergeResponse;
import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
import org.elasticsearch.action.admin.indices.mapping.put.PutMappingResponse;
import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
import org.elasticsearch.action.admin.indices.open.OpenIndexResponse;
-import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
-import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
+import org.elasticsearch.action.admin.indices.rollover.RolloverRequest;
+import org.elasticsearch.action.admin.indices.rollover.RolloverResponse;
import org.elasticsearch.action.admin.indices.shrink.ResizeRequest;
import org.elasticsearch.action.admin.indices.shrink.ResizeResponse;
@@ -261,6 +263,28 @@ public void flushAsync(FlushRequest flushRequest, ActionListener
listener, emptySet(), headers);
}
+ /**
+ * Force merge one or more indices using the Force Merge API
+ *
+ * See
+ * Force Merge API on elastic.co
+ */
+ public ForceMergeResponse forceMerge(ForceMergeRequest forceMergeRequest, Header... headers) throws IOException {
+ return restHighLevelClient.performRequestAndParseEntity(forceMergeRequest, Request::forceMerge, ForceMergeResponse::fromXContent,
+ emptySet(), headers);
+ }
+
+ /**
+ * Asynchronously force merge one or more indices using the Force Merge API
+ *
+ * See
+ * Force Merge API on elastic.co
+ */
+ public void forceMergeAsync(ForceMergeRequest forceMergeRequest, ActionListener listener, Header... headers) {
+ restHighLevelClient.performRequestAsyncAndParseEntity(forceMergeRequest, Request::forceMerge, ForceMergeResponse::fromXContent,
+ listener, emptySet(), headers);
+ }
+
/**
* Clears the cache of one or more indices using the Clear Cache API
*
- * You need to wrap your code between two tags like:
- * // tag::example
- * // end::example
- *
- * Where example is your tag name.
- *
- * Then in the documentation, you can extract what is between tag and end tags with
- * ["source","java",subs="attributes,callouts,macros"]
- * --------------------------------------------------
- * include-tagged::{doc-tests}/SearchDocumentationIT.java[example]
- * --------------------------------------------------
- *
- * The column width of the code block is 84. If the code contains a line longer
- * than 84, the line will be cut and a horizontal scroll bar will be displayed.
- * (the code indentation of the tag is not included in the width)
+ * Documentation for search APIs in the high level java client.
+ * Code wrapped in {@code tag} and {@code end} tags is included in the docs.
*/
public class SearchDocumentationIT extends ESRestHighLevelClientTestCase {
@SuppressWarnings({"unused", "unchecked"})
public void testSearch() throws Exception {
+ indexSearchTestData();
RestHighLevelClient client = highLevelClient();
- {
- BulkRequest request = new BulkRequest();
- request.add(new IndexRequest("posts", "doc", "1")
- .source(XContentType.JSON, "title", "In which order are my Elasticsearch queries executed?", "user",
- Arrays.asList("kimchy", "luca"), "innerObject", Collections.singletonMap("key", "value")));
- request.add(new IndexRequest("posts", "doc", "2")
- .source(XContentType.JSON, "title", "Current status and upcoming changes in Elasticsearch", "user",
- Arrays.asList("kimchy", "christoph"), "innerObject", Collections.singletonMap("key", "value")));
- request.add(new IndexRequest("posts", "doc", "3")
- .source(XContentType.JSON, "title", "The Future of Federated Search in Elasticsearch", "user",
- Arrays.asList("kimchy", "tanguy"), "innerObject", Collections.singletonMap("key", "value")));
- request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
- BulkResponse bulkResponse = client.bulk(request);
- assertSame(RestStatus.OK, bulkResponse.status());
- assertFalse(bulkResponse.hasFailures());
- }
{
// tag::search-request-basic
SearchRequest searchRequest = new SearchRequest(); // <1>
@@ -715,4 +687,90 @@ public void onFailure(Exception e) {
assertTrue(succeeded);
}
}
+
+ public void testMultiSearch() throws Exception {
+ indexSearchTestData();
+ RestHighLevelClient client = highLevelClient();
+ {
+ // tag::multi-search-request-basic
+ MultiSearchRequest request = new MultiSearchRequest(); // <1>
+ SearchRequest firstSearchRequest = new SearchRequest(); // <2>
+ SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder();
+ searchSourceBuilder.query(QueryBuilders.matchQuery("user", "kimchy"));
+ firstSearchRequest.source(searchSourceBuilder);
+ request.add(firstSearchRequest); // <3>
+ SearchRequest secondSearchRequest = new SearchRequest(); // <4>
+ searchSourceBuilder = new SearchSourceBuilder();
+ searchSourceBuilder.query(QueryBuilders.matchQuery("user", "luca"));
+ secondSearchRequest.source(searchSourceBuilder);
+ request.add(secondSearchRequest);
+ // end::multi-search-request-basic
+ // tag::multi-search-execute
+ MultiSearchResponse response = client.multiSearch(request);
+ // end::multi-search-execute
+ // tag::multi-search-response
+ MultiSearchResponse.Item firstResponse = response.getResponses()[0]; // <1>
+ assertNull(firstResponse.getFailure()); // <2>
+ SearchResponse searchResponse = firstResponse.getResponse(); // <3>
+ assertEquals(3, searchResponse.getHits().getTotalHits());
+ MultiSearchResponse.Item secondResponse = response.getResponses()[1]; // <4>
+ assertNull(secondResponse.getFailure());
+ searchResponse = secondResponse.getResponse();
+ assertEquals(1, searchResponse.getHits().getTotalHits());
+ // end::multi-search-response
+
+ // tag::multi-search-execute-listener
+ ActionListener listener = new ActionListener() {
+ @Override
+ public void onResponse(MultiSearchResponse response) {
+ // <1>
+ }
+
+ @Override
+ public void onFailure(Exception e) {
+ // <2>
+ }
+ };
+ // end::multi-search-execute-listener
+
+ // Replace the empty listener by a blocking listener in test
+ final CountDownLatch latch = new CountDownLatch(1);
+ listener = new LatchedActionListener<>(listener, latch);
+
+ // tag::multi-search-execute-async
+ client.multiSearchAsync(request, listener); // <1>
+ // end::multi-search-execute-async
+
+ assertTrue(latch.await(30L, TimeUnit.SECONDS));
+ }
+ {
+ // tag::multi-search-request-index
+ MultiSearchRequest request = new MultiSearchRequest();
+ request.add(new SearchRequest("posts") // <1>
+ .types("doc")); // <2>
+ // end::multi-search-request-index
+ MultiSearchResponse response = client.multiSearch(request);
+ MultiSearchResponse.Item firstResponse = response.getResponses()[0];
+ assertNull(firstResponse.getFailure());
+ SearchResponse searchResponse = firstResponse.getResponse();
+ assertEquals(3, searchResponse.getHits().getTotalHits());
+ }
+ }
+
+ private void indexSearchTestData() throws IOException {
+ BulkRequest request = new BulkRequest();
+ request.add(new IndexRequest("posts", "doc", "1")
+ .source(XContentType.JSON, "title", "In which order are my Elasticsearch queries executed?", "user",
+ Arrays.asList("kimchy", "luca"), "innerObject", Collections.singletonMap("key", "value")));
+ request.add(new IndexRequest("posts", "doc", "2")
+ .source(XContentType.JSON, "title", "Current status and upcoming changes in Elasticsearch", "user",
+ Arrays.asList("kimchy", "christoph"), "innerObject", Collections.singletonMap("key", "value")));
+ request.add(new IndexRequest("posts", "doc", "3")
+ .source(XContentType.JSON, "title", "The Future of Federated Search in Elasticsearch", "user",
+ Arrays.asList("kimchy", "tanguy"), "innerObject", Collections.singletonMap("key", "value")));
+ request.setRefreshPolicy(WriteRequest.RefreshPolicy.IMMEDIATE);
+ BulkResponse bulkResponse = highLevelClient().bulk(request);
+ assertSame(RestStatus.OK, bulkResponse.status());
+ assertFalse(bulkResponse.hasFailures());
+ }
}
diff --git a/docs/community-clients/index.asciidoc b/docs/community-clients/index.asciidoc
index ca37c42fb0202..76312f39345e7 100644
--- a/docs/community-clients/index.asciidoc
+++ b/docs/community-clients/index.asciidoc
@@ -8,6 +8,7 @@ Besides the link:/guide[officially supported Elasticsearch clients], there are
a number of clients that have been contributed by the community for various languages:
* <>
+* <>
* <>
* <>
* <>
@@ -35,6 +36,10 @@ a number of clients that have been contributed by the community for various lang
* https://www.b4x.com/android/forum/threads/server-jelasticsearch-search-and-text-analytics.73335/
B4J client based on the official Java REST client.
+[[cpp]]
+== C++
+* https://github.com/seznam/elasticlient[elasticlient]: simple library for simplified work with Elasticsearch in C++
+
[[clojure]]
== Clojure
diff --git a/docs/java-rest/high-level/indices/force_merge.asciidoc b/docs/java-rest/high-level/indices/force_merge.asciidoc
new file mode 100644
index 0000000000000..6fe1fcd82b749
--- /dev/null
+++ b/docs/java-rest/high-level/indices/force_merge.asciidoc
@@ -0,0 +1,102 @@
+[[java-rest-high-force-merge]]
+=== Force Merge API
+
+[[java-rest-high-force-merge-request]]
+==== Force merge Request
+
+A `ForceMergeRequest` can be applied to one or more indices, or even on `_all` the indices:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-request]
+--------------------------------------------------
+<1> Force merge one index
+<2> Force merge multiple indices
+<3> Force merge all the indices
+
+==== Optional arguments
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-request-indicesOptions]
+--------------------------------------------------
+<1> Setting `IndicesOptions` controls how unavailable indices are resolved and
+how wildcard expressions are expanded
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-request-segments-num]
+--------------------------------------------------
+<1> Set `max_num_segments` to control the number of segments to merge down to.
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-request-only-expunge-deletes]
+--------------------------------------------------
+<1> Set the `only_expunge_deletes` flag to `true`
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-request-flush]
+--------------------------------------------------
+<1> Set the `flush` flag to `true`
+
+[[java-rest-high-force-merge-sync]]
+==== Synchronous Execution
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-execute]
+--------------------------------------------------
+
+[[java-rest-high-force-merge-async]]
+==== Asynchronous Execution
+
+The asynchronous execution of a force merge request requires both the `ForceMergeRequest`
+instance and an `ActionListener` instance to be passed to the asynchronous
+method:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-execute-async]
+--------------------------------------------------
+<1> The `ForceMergeRequest` to execute and the `ActionListener` to use when
+the execution completes
+
+The asynchronous method does not block and returns immediately. Once it is
+completed the `ActionListener` is called back using the `onResponse` method
+if the execution successfully completed or using the `onFailure` method if
+it failed.
+
+A typical listener for `ForceMergeResponse` looks like:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-execute-listener]
+--------------------------------------------------
+<1> Called when the execution is successfully completed. The response is
+provided as an argument
+<2> Called in case of failure. The raised exception is provided as an argument
+
+[[java-rest-high-force-merge-response]]
+==== Force Merge Response
+
+The returned `ForceMergeResponse` allows to retrieve information about the
+executed operation as follows:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-response]
+--------------------------------------------------
+<1> Total number of shards hit by the force merge request
+<2> Number of shards where the force merge has succeeded
+<3> Number of shards where the force merge has failed
+<4> A list of failures if the operation failed on one or more shards
+
+By default, if the indices were not found, an `ElasticsearchException` will be thrown:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/IndicesClientDocumentationIT.java[force-merge-notfound]
+--------------------------------------------------
+<1> Do something if the indices to be force merged were not found
\ No newline at end of file
diff --git a/docs/java-rest/high-level/search/multi-search.asciidoc b/docs/java-rest/high-level/search/multi-search.asciidoc
new file mode 100644
index 0000000000000..1b76f8976666a
--- /dev/null
+++ b/docs/java-rest/high-level/search/multi-search.asciidoc
@@ -0,0 +1,90 @@
+[[java-rest-high-multi-search]]
+=== Multi-Search API
+
+The `multiSearch` API executes multiple <>
+requests in a single http request in parallel.
+
+[[java-rest-high-multi-search-request]]
+==== Multi-Search Request
+
+The `MultiSearchRequest` is built empty and you add all of the searches that
+you wish to execute to it:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/SearchDocumentationIT.java[multi-search-request-basic]
+--------------------------------------------------
+<1> Create an empty `MultiSearchRequest`.
+<2> Create an empty `SearchRequest` and populate it just like you
+would for a regular <>.
+<3> Add the `SearchRequest` to the `MultiSearchRequest`.
+<4> Build a second `SearchRequest` and add it to the `MultiSearchRequest`.
+
+===== Optional arguments
+
+The `SearchRequest`s inside of `MultiSearchRequest` support all of
+<>'s optional arguments.
+For example:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/SearchDocumentationIT.java[search-request-indices-types]
+--------------------------------------------------
+<1> Restricts the request to an index
+<2> Limits the request to a type
+
+[[java-rest-high-multi-search-sync]]
+==== Synchronous Execution
+
+The `multiSearch` method executes `MultiSearchRequest`s synchronously:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/SearchDocumentationIT.java[multi-search-execute]
+--------------------------------------------------
+
+[[java-rest-high-multi-search-async]]
+==== Asynchronous Execution
+
+The `multiSearchAsync` method executes `MultiSearchRequest`s asynchronously,
+calling the provided `ActionListener` when the response is ready.
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/SearchDocumentationIT.java[search-execute-async]
+--------------------------------------------------
+<1> The `MultiSearchRequest` to execute and the `ActionListener` to use when
+the execution completes
+
+The asynchronous method does not block and returns immediately. Once it is
+completed the `ActionListener` is called back using the `onResponse` method
+if the execution successfully completed or using the `onFailure` method if
+it failed.
+
+A typical listener for `MultiSearchResponse` looks like:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/SearchDocumentationIT.java[multi-search-execute-listener]
+--------------------------------------------------
+<1> Called when the execution is successfully completed.
+<2> Called when the whole `SearchRequest` fails.
+
+==== MultiSearchResponse
+
+The `MultiSearchResponse` that is returned by executing the `multiSearch`
+a `MultiSearchResponse.Item` for each `SearchRequest` in the
+`MultiSearchRequest`. Each `MultiSearchResponse.Item` contains an
+exception in `getFailure` if the request failed or a
+<> in `getResponse` if
+the request succeeded:
+
+["source","java",subs="attributes,callouts,macros"]
+--------------------------------------------------
+include-tagged::{doc-tests}/SearchDocumentationIT.java[multi-search-response]
+--------------------------------------------------
+<1> The item for the first search.
+<2> It succeeded so `getFailure` returns null.
+<3> And there is a <> in
+`getResponse`.
+<4> The item for the second search.
diff --git a/docs/java-rest/high-level/search/search.asciidoc b/docs/java-rest/high-level/search/search.asciidoc
index 2e8dda64286f4..af81775a90072 100644
--- a/docs/java-rest/high-level/search/search.asciidoc
+++ b/docs/java-rest/high-level/search/search.asciidoc
@@ -20,6 +20,7 @@ include-tagged::{doc-tests}/SearchDocumentationIT.java[search-request-basic]
<3> Add a `match_all` query to the `SearchSourceBuilder`.
<4> Add the `SearchSourceBuilder` to the `SeachRequest`.
+[[java-rest-high-search-request-optional]]
===== Optional arguments
Let's first look at some of the optional arguments of a `SearchRequest`:
@@ -140,7 +141,7 @@ The `SearchSourceBuilder` allows to add one or more `SortBuilder` instances. The
include-tagged::{doc-tests}/SearchDocumentationIT.java[search-source-sorting]
--------------------------------------------------
<1> Sort descending by `_score` (the default)
-<2> Also sort ascending by `_id` field
+<2> Also sort ascending by `_id` field
===== Source filtering
@@ -268,6 +269,7 @@ include-tagged::{doc-tests}/SearchDocumentationIT.java[search-execute-listener]
<1> Called when the execution is successfully completed.
<2> Called when the whole `SearchRequest` fails.
+[[java-rest-high-search-response]]
==== SearchResponse
The `SearchResponse` that is returned by executing the search provides details
diff --git a/docs/java-rest/high-level/supported-apis.asciidoc b/docs/java-rest/high-level/supported-apis.asciidoc
index bea30690fe183..0330b1903c5bf 100644
--- a/docs/java-rest/high-level/supported-apis.asciidoc
+++ b/docs/java-rest/high-level/supported-apis.asciidoc
@@ -31,9 +31,11 @@ The Java High Level REST Client supports the following Search APIs:
* <>
* <>
* <>
+* <>
include::search/search.asciidoc[]
include::search/scroll.asciidoc[]
+include::search/multi-search.asciidoc[]
== Miscellaneous APIs
@@ -60,6 +62,7 @@ Index Management::
* <>
* <>
* <>
+* <>
* <>
Mapping Management::
@@ -79,6 +82,7 @@ include::indices/split_index.asciidoc[]
include::indices/refresh.asciidoc[]
include::indices/flush.asciidoc[]
include::indices/clear_cache.asciidoc[]
+include::indices/force_merge.asciidoc[]
include::indices/rollover.asciidoc[]
include::indices/put_mapping.asciidoc[]
include::indices/update_aliases.asciidoc[]
diff --git a/docs/java-rest/low-level/configuration.asciidoc b/docs/java-rest/low-level/configuration.asciidoc
index 54f7cd2817354..b0753496558bb 100644
--- a/docs/java-rest/low-level/configuration.asciidoc
+++ b/docs/java-rest/low-level/configuration.asciidoc
@@ -86,3 +86,16 @@ will be used.
For any other required configuration needed, the Apache HttpAsyncClient docs
should be consulted: https://hc.apache.org/httpcomponents-asyncclient-4.1.x/ .
+
+NOTE: If your application runs under the security manager you might be subject
+to the JVM default policies of caching positive hostname resolutions
+indefinitely and negative hostname resolutions for ten seconds. If the resolved
+addresses of the hosts to which you are connecting the client to vary with time
+then you might want to modify the default JVM behavior. These can be modified by
+adding
+http://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html[`networkaddress.cache.ttl=`]
+and
+http://docs.oracle.com/javase/8/docs/technotes/guides/net/properties.html[`networkaddress.cache.negative.ttl=`]
+to your
+http://docs.oracle.com/javase/8/docs/technotes/guides/security/PolicyFiles.html[Java
+security policy].
diff --git a/docs/reference/docs/index_.asciidoc b/docs/reference/docs/index_.asciidoc
index faecc08f7c503..07fbe952c98bf 100644
--- a/docs/reference/docs/index_.asciidoc
+++ b/docs/reference/docs/index_.asciidoc
@@ -249,7 +249,7 @@ on a per-operation basis using the `routing` parameter. For example:
[source,js]
--------------------------------------------------
-POST twitter/tweet?routing=kimchy
+POST twitter/_doc?routing=kimchy
{
"user" : "kimchy",
"post_date" : "2009-11-15T14:12:12",
diff --git a/docs/reference/mapping/types/geo-point.asciidoc b/docs/reference/mapping/types/geo-point.asciidoc
index 7d92bb3b2e7c7..ae81773e6a0a2 100644
--- a/docs/reference/mapping/types/geo-point.asciidoc
+++ b/docs/reference/mapping/types/geo-point.asciidoc
@@ -105,6 +105,13 @@ The following parameters are accepted by `geo_point` fields:
If `true`, malformed geo-points are ignored. If `false` (default),
malformed geo-points throw an exception and reject the whole document.
+`ignore_z_value`::
+
+ If `true` (default) three dimension points will be accepted (stored in source)
+ but only latitude and longitude values will be indexed; the third dimension is
+ ignored. If `false`, geo-points containing any more than latitude and longitude
+ (two dimensions) values throw an exception and reject the whole document.
+
==== Using geo-points in scripts
When accessing the value of a geo-point in a script, the value is returned as
diff --git a/docs/reference/mapping/types/geo-shape.asciidoc b/docs/reference/mapping/types/geo-shape.asciidoc
index 23caaf6a8ec5c..26974f1f867de 100644
--- a/docs/reference/mapping/types/geo-shape.asciidoc
+++ b/docs/reference/mapping/types/geo-shape.asciidoc
@@ -91,6 +91,12 @@ false (default), malformed GeoJSON and WKT shapes throw an exception and reject
entire document.
| `false`
+|`ignore_z_value` |If `true` (default) three dimension points will be accepted (stored in source)
+but only latitude and longitude values will be indexed; the third dimension is ignored. If `false`,
+geo-points containing any more than latitude and longitude (two dimensions) values throw an exception
+and reject the whole document.
+| `true`
+
|=======================================================================
diff --git a/docs/reference/modules/cluster/misc.asciidoc b/docs/reference/modules/cluster/misc.asciidoc
index 3963312c0f4ea..837cfcc43ebf7 100644
--- a/docs/reference/modules/cluster/misc.asciidoc
+++ b/docs/reference/modules/cluster/misc.asciidoc
@@ -56,3 +56,30 @@ PUT /_cluster/settings
}
-------------------------------
// CONSOLE
+
+
+[[persistent-tasks-allocation]]
+==== Persistent Tasks Allocations
+
+Plugins can create a kind of tasks called persistent tasks. Those tasks are
+usually long-live tasks and are stored in the cluster state, allowing the
+tasks to be revived after a full cluster restart.
+
+Every time a persistent task is created, the master nodes takes care of
+assigning the task to a node of the cluster, and the assigned node will then
+pick up the task and execute it locally. The process of assigning persistent
+tasks to nodes is controlled by the following property, which can be updated
+dynamically:
+
+`cluster.persistent_tasks.allocation.enable`::
++
+--
+Enable or disable allocation for persistent tasks:
+
+* `all` - (default) Allows persistent tasks to be assigned to nodes
+* `none` - No allocations are allowed for any type of persistent task
+
+This setting does not affect the persistent tasks that are already being executed.
+Only newly created persistent tasks, or tasks that must be reassigned (after a node
+left the cluster, for example), are impacted by this setting.
+--
diff --git a/docs/reference/modules/snapshots.asciidoc b/docs/reference/modules/snapshots.asciidoc
index b8883173b9890..ea3f99debb94e 100644
--- a/docs/reference/modules/snapshots.asciidoc
+++ b/docs/reference/modules/snapshots.asciidoc
@@ -401,7 +401,7 @@ created the snapshotting process will be aborted and all files created as part o
cleaned. Therefore, the delete snapshot operation can be used to cancel long running snapshot operations that were
started by mistake.
-A repository can be deleted using the following command:
+A repository can be unregistered using the following command:
[source,sh]
-----------------------------------
@@ -410,7 +410,7 @@ DELETE /_snapshot/my_fs_backup
// CONSOLE
// TEST[continued]
-When a repository is deleted, Elasticsearch only removes the reference to the location where the repository is storing
+When a repository is unregistered, Elasticsearch only removes the reference to the location where the repository is storing
the snapshots. The snapshots themselves are left untouched and in place.
[float]
diff --git a/docs/reference/search/rank-eval.asciidoc b/docs/reference/search/rank-eval.asciidoc
index 76143c726167e..cb1914a70768a 100644
--- a/docs/reference/search/rank-eval.asciidoc
+++ b/docs/reference/search/rank-eval.asciidoc
@@ -1,14 +1,16 @@
[[search-rank-eval]]
== Ranking Evaluation API
+experimental[The ranking evaluation API is experimental and may be changed or removed completely in a future release,
+as well as change in non-backwards compatible ways on minor versions updates. Elastic will take a best effort
+approach to fix any issues, but experimental features are not subject to the support SLA of official GA features.]
+
The ranking evaluation API allows to evaluate the quality of ranked search
results over a set of typical search queries. Given this set of queries and a
list or manually rated documents, the `_rank_eval` endpoint calculates and
returns typical information retrieval metrics like _mean reciprocal rank_,
_precision_ or _discounted cumulative gain_.
-experimental[The ranking evaluation API is new and may change in non-backwards compatible ways in the future, even on minor versions updates.]
-
[float]
=== Overview
@@ -41,7 +43,7 @@ GET /my_index/_rank_eval
{
"requests": [ ... ], <1>
"metric": { <2>
- "reciprocal_rank": { ... } <3>
+ "mean_reciprocal_rank": { ... } <3>
}
}
------------------------------
@@ -85,7 +87,7 @@ The request section contains several search requests typical to your application
<3> a list of document ratings, each entry containing the documents `_index` and `_id` together with
the rating of the documents relevance with regards to this search request
-A document `rating` can be any integer value that expresses the relevance of the document on a user defined scale. For some of the metrics, just giving a binary rating (e.g. `0` for irrelevant and `1` for relevant) will be sufficient, other metrics can use a more fine grained scale.
+A document `rating` can be any integer value that expresses the relevance of the document on a user defined scale. For some of the metrics, just giving a binary rating (e.g. `0` for irrelevant and `1` for relevant) will be sufficient, other metrics can use a more fine grained scale.
NOTE: To use the ranking evaluation API with indices that use multiple types, you should add a filter on the `_type` field to
the query in the request. Otherwise, if your index uses multiple types with the same id, the provided
@@ -162,6 +164,7 @@ GET /twitter/_rank_eval
}],
"metric": {
"precision": {
+ "k" : 20,
"relevant_rating_threshold": 1,
"ignore_unlabeled": false
}
@@ -176,7 +179,9 @@ The `precision` metric takes the following optional parameters
[cols="<,<",options="header",]
|=======================================================================
|Parameter |Description
-|`relevant_rating_threshold` |Sets the rating threshold above which documents are considered to be
+|`k` |sets the maximum number of documents retrieved per query. This value will act in place of the usual `size` parameter
+in the query. Defaults to 10.
+|`relevant_rating_threshold` |sets the rating threshold above which documents are considered to be
"relevant". Defaults to `1`.
|`ignore_unlabeled` |controls how unlabeled documents in the search results are counted.
If set to 'true', unlabeled documents are ignored and neither count as relevant or irrelevant. Set to 'false' (the default), they are treated as irrelevant.
@@ -202,6 +207,7 @@ GET /twitter/_rank_eval
}],
"metric": {
"mean_reciprocal_rank": {
+ "k" : 20,
"relevant_rating_threshold" : 1
}
}
@@ -215,6 +221,8 @@ The `mean_reciprocal_rank` metric takes the following optional parameters
[cols="<,<",options="header",]
|=======================================================================
|Parameter |Description
+|`k` |sets the maximum number of documents retrieved per query. This value will act in place of the usual `size` parameter
+in the query. Defaults to 10.
|`relevant_rating_threshold` |Sets the rating threshold above which documents are considered to be
"relevant". Defaults to `1`.
|=======================================================================
@@ -238,6 +246,7 @@ GET /twitter/_rank_eval
}],
"metric": {
"dcg": {
+ "k" : 20,
"normalize": false
}
}
@@ -251,6 +260,8 @@ The `dcg` metric takes the following optional parameters:
[cols="<,<",options="header",]
|=======================================================================
|Parameter |Description
+|`k` |sets the maximum number of documents retrieved per query. This value will act in place of the usual `size` parameter
+in the query. Defaults to 10.
|`normalize` | If set to `true`, this metric will calculate the https://en.wikipedia.org/wiki/Discounted_cumulative_gain#Normalized_DCG[Normalized DCG].
|=======================================================================
diff --git a/docs/reference/setup/important-settings.asciidoc b/docs/reference/setup/important-settings.asciidoc
index 997f267a7e29f..b9b99b708031e 100644
--- a/docs/reference/setup/important-settings.asciidoc
+++ b/docs/reference/setup/important-settings.asciidoc
@@ -30,3 +30,5 @@ include::important-settings/heap-size.asciidoc[]
include::important-settings/heap-dump-path.asciidoc[]
include::important-settings/gc-logging.asciidoc[]
+
+include::important-settings/error-file.asciidoc[]
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java
index 58fd3b0a694ae..7d3ec94811c5a 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RankEvalRequest.java
@@ -22,24 +22,47 @@
import org.elasticsearch.Version;
import org.elasticsearch.action.ActionRequest;
import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.IndicesRequest;
+import org.elasticsearch.action.search.SearchRequest;
+import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Objects;
/**
* Request to perform a search ranking evaluation.
*/
-public class RankEvalRequest extends ActionRequest {
+public class RankEvalRequest extends ActionRequest implements IndicesRequest.Replaceable {
private RankEvalSpec rankingEvaluationSpec;
+
+ private IndicesOptions indicesOptions = SearchRequest.DEFAULT_INDICES_OPTIONS;
private String[] indices = Strings.EMPTY_ARRAY;
public RankEvalRequest(RankEvalSpec rankingEvaluationSpec, String[] indices) {
- this.rankingEvaluationSpec = rankingEvaluationSpec;
- setIndices(indices);
+ this.rankingEvaluationSpec = Objects.requireNonNull(rankingEvaluationSpec, "ranking evaluation specification must not be null");
+ indices(indices);
+ }
+
+ RankEvalRequest(StreamInput in) throws IOException {
+ super.readFrom(in);
+ rankingEvaluationSpec = new RankEvalSpec(in);
+ if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
+ indices = in.readStringArray();
+ indicesOptions = IndicesOptions.readIndicesOptions(in);
+ } else {
+ // readStringArray uses readVInt for size, we used readInt in 6.2
+ int indicesSize = in.readInt();
+ String[] indices = new String[indicesSize];
+ for (int i = 0; i < indicesSize; i++) {
+ indices[i] = in.readString();
+ }
+ // no indices options yet
+ }
}
RankEvalRequest() {
@@ -72,7 +95,8 @@ public void setRankEvalSpec(RankEvalSpec task) {
/**
* Sets the indices the search will be executed on.
*/
- public RankEvalRequest setIndices(String... indices) {
+ @Override
+ public RankEvalRequest indices(String... indices) {
Objects.requireNonNull(indices, "indices must not be null");
for (String index : indices) {
Objects.requireNonNull(index, "index must not be null");
@@ -84,24 +108,23 @@ public RankEvalRequest setIndices(String... indices) {
/**
* @return the indices for this request
*/
- public String[] getIndices() {
+ @Override
+ public String[] indices() {
return indices;
}
+ @Override
+ public IndicesOptions indicesOptions() {
+ return indicesOptions;
+ }
+
+ public void indicesOptions(IndicesOptions indicesOptions) {
+ this.indicesOptions = Objects.requireNonNull(indicesOptions, "indicesOptions must not be null");
+ }
+
@Override
public void readFrom(StreamInput in) throws IOException {
- super.readFrom(in);
- rankingEvaluationSpec = new RankEvalSpec(in);
- if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
- indices = in.readStringArray();
- } else {
- // readStringArray uses readVInt for size, we used readInt in 6.2
- int indicesSize = in.readInt();
- String[] indices = new String[indicesSize];
- for (int i = 0; i < indicesSize; i++) {
- indices[i] = in.readString();
- }
- }
+ throw new UnsupportedOperationException("usage of Streamable is to be replaced by Writeable");
}
@Override
@@ -110,12 +133,33 @@ public void writeTo(StreamOutput out) throws IOException {
rankingEvaluationSpec.writeTo(out);
if (out.getVersion().onOrAfter(Version.V_6_3_0)) {
out.writeStringArray(indices);
+ indicesOptions.writeIndicesOptions(out);
} else {
// writeStringArray uses writeVInt for size, we used writeInt in 6.2
out.writeInt(indices.length);
for (String index : indices) {
out.writeString(index);
}
+ // no indices options yet
+ }
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
}
+ RankEvalRequest that = (RankEvalRequest) o;
+ return Objects.equals(indicesOptions, that.indicesOptions) &&
+ Arrays.equals(indices, that.indices) &&
+ Objects.equals(rankingEvaluationSpec, that.rankingEvaluationSpec);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(indicesOptions, Arrays.hashCode(indices), rankingEvaluationSpec);
}
}
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java
index a596caf4f5c7b..34cf953ea50b7 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/RestRankEvalAction.java
@@ -108,7 +108,7 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
}
private static void parseRankEvalRequest(RankEvalRequest rankEvalRequest, RestRequest request, XContentParser parser) {
- rankEvalRequest.setIndices(Strings.splitStringByCommaToArray(request.param("index")));
+ rankEvalRequest.indices(Strings.splitStringByCommaToArray(request.param("index")));
RankEvalSpec spec = RankEvalSpec.parse(parser);
rankEvalRequest.setRankEvalSpec(spec);
}
diff --git a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/TransportRankEvalAction.java b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/TransportRankEvalAction.java
index a4ce4c7ee92e7..d24a779fd61ce 100644
--- a/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/TransportRankEvalAction.java
+++ b/modules/rank-eval/src/main/java/org/elasticsearch/index/rankeval/TransportRankEvalAction.java
@@ -75,8 +75,8 @@ public class TransportRankEvalAction extends HandledTransportAction {
+
+ private static RankEvalPlugin rankEvalPlugin = new RankEvalPlugin();
+
+ @AfterClass
+ public static void releasePluginResources() throws IOException {
+ rankEvalPlugin.close();
+ }
+
+ @Override
+ protected NamedXContentRegistry xContentRegistry() {
+ return new NamedXContentRegistry(rankEvalPlugin.getNamedXContent());
+ }
+
+ @Override
+ protected NamedWriteableRegistry getNamedWriteableRegistry() {
+ return new NamedWriteableRegistry(rankEvalPlugin.getNamedWriteables());
+ }
+
+ @Override
+ protected RankEvalRequest createTestInstance() {
+ int numberOfIndices = randomInt(3);
+ String[] indices = new String[numberOfIndices];
+ for (int i=0; i < numberOfIndices; i++) {
+ indices[i] = randomAlphaOfLengthBetween(5, 10);
+ }
+ RankEvalRequest rankEvalRequest = new RankEvalRequest(RankEvalSpecTests.createTestItem(), indices);
+ IndicesOptions indicesOptions = IndicesOptions.fromOptions(
+ randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean());
+ rankEvalRequest.indicesOptions(indicesOptions);
+ return rankEvalRequest;
+ }
+
+ @Override
+ protected Reader instanceReader() {
+ return RankEvalRequest::new;
+ }
+
+ @Override
+ protected RankEvalRequest mutateInstance(RankEvalRequest instance) throws IOException {
+ RankEvalRequest mutation = copyInstance(instance);
+ List mutators = new ArrayList<>();
+ mutators.add(() -> mutation.indices(ArrayUtils.concat(instance.indices(), new String[] { randomAlphaOfLength(10) })));
+ mutators.add(() -> mutation.indicesOptions(randomValueOtherThan(instance.indicesOptions(),
+ () -> IndicesOptions.fromOptions(randomBoolean(), randomBoolean(), randomBoolean(), randomBoolean()))));
+ mutators.add(() -> mutation.setRankEvalSpec(RankEvalSpecTests.mutateTestItem(instance.getRankEvalSpec())));
+ randomFrom(mutators).run();
+ return mutation;
+ }
+}
diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalSpecTests.java b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalSpecTests.java
index 26611679f3494..94338e570a5d2 100644
--- a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalSpecTests.java
+++ b/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalSpecTests.java
@@ -70,7 +70,7 @@ private static List randomList(Supplier randomSupplier) {
return result;
}
- private static RankEvalSpec createTestItem() throws IOException {
+ static RankEvalSpec createTestItem() {
Supplier metric = randomFrom(Arrays.asList(
() -> PrecisionAtKTests.createTestItem(),
() -> MeanReciprocalRankTests.createTestItem(),
@@ -87,6 +87,9 @@ private static RankEvalSpec createTestItem() throws IOException {
builder.field("field", randomAlphaOfLengthBetween(1, 5));
builder.endObject();
script = Strings.toString(builder);
+ } catch (IOException e) {
+ // this shouldn't happen in tests, re-throw just not to swallow it
+ throw new RuntimeException(e);
}
templates = new HashSet<>();
@@ -156,7 +159,7 @@ public void testEqualsAndHash() throws IOException {
checkEqualsAndHashCode(createTestItem(), RankEvalSpecTests::copy, RankEvalSpecTests::mutateTestItem);
}
- private static RankEvalSpec mutateTestItem(RankEvalSpec original) {
+ static RankEvalSpec mutateTestItem(RankEvalSpec original) {
List ratedRequests = new ArrayList<>(original.getRatedRequests());
EvaluationMetric metric = original.getMetric();
Map templates = new HashMap<>(original.getTemplates());
diff --git a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
index 5e17769398c49..49d7be69d4a8f 100644
--- a/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
+++ b/qa/full-cluster-restart/src/test/java/org/elasticsearch/upgrades/FullClusterRestartIT.java
@@ -430,6 +430,20 @@ public void testShrinkAfterUpgrade() throws IOException {
if (runningAgainstOldCluster) {
XContentBuilder mappingsAndSettings = jsonBuilder();
mappingsAndSettings.startObject();
+ // single type was added in 5.5.0 (see #24317)
+ if (oldClusterVersion.onOrAfter(Version.V_5_5_0) &&
+ oldClusterVersion.before(Version.V_6_0_0_beta1) &&
+ randomBoolean()) {
+ {
+ // test that mapping.single_type is correctly propagated on the shrinked index,
+ // if not, search will fail.
+ mappingsAndSettings.startObject("settings");
+ mappingsAndSettings.startObject("mapping");
+ mappingsAndSettings.field("single_type", true);
+ mappingsAndSettings.endObject();
+ mappingsAndSettings.endObject();
+ }
+ }
{
mappingsAndSettings.startObject("mappings");
mappingsAndSettings.startObject("doc");
diff --git a/qa/smoke-test-rank-eval-with-mustache/src/test/java/org/elasticsearch/index/rankeval/SmokeMultipleTemplatesIT.java b/qa/smoke-test-rank-eval-with-mustache/src/test/java/org/elasticsearch/index/rankeval/SmokeMultipleTemplatesIT.java
index 178d429ca9ffd..50860ddd87b21 100644
--- a/qa/smoke-test-rank-eval-with-mustache/src/test/java/org/elasticsearch/index/rankeval/SmokeMultipleTemplatesIT.java
+++ b/qa/smoke-test-rank-eval-with-mustache/src/test/java/org/elasticsearch/index/rankeval/SmokeMultipleTemplatesIT.java
@@ -102,7 +102,7 @@ public void testPrecisionAtRequest() throws IOException {
RankEvalRequestBuilder builder = new RankEvalRequestBuilder(client(), RankEvalAction.INSTANCE, new RankEvalRequest());
builder.setRankEvalSpec(task);
- RankEvalResponse response = client().execute(RankEvalAction.INSTANCE, builder.request().setIndices("test")).actionGet();
+ RankEvalResponse response = client().execute(RankEvalAction.INSTANCE, builder.request().indices("test")).actionGet();
assertEquals(0.9, response.getEvaluationResult(), Double.MIN_VALUE);
}
diff --git a/server/src/main/java/org/elasticsearch/Version.java b/server/src/main/java/org/elasticsearch/Version.java
index 1d632ae967dff..d23847c700de4 100644
--- a/server/src/main/java/org/elasticsearch/Version.java
+++ b/server/src/main/java/org/elasticsearch/Version.java
@@ -25,6 +25,8 @@
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.xcontent.ToXContentFragment;
+import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.monitor.jvm.JvmInfo;
import java.io.IOException;
@@ -34,7 +36,7 @@
import java.util.Collections;
import java.util.List;
-public class Version implements Comparable {
+public class Version implements Comparable, ToXContentFragment {
/*
* The logic for ID is: XXYYZZAA, where XX is major version, YY is minor version, ZZ is revision, and AA is alpha/beta/rc indicator AA
* values below 25 are for alpha builder (since 5.0), and above 25 and below 50 are beta builds, and below 99 are RC builds, with 99
@@ -145,8 +147,6 @@ public class Version implements Comparable {
public static final Version V_6_1_3 = new Version(V_6_1_3_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
public static final int V_6_1_4_ID = 6010499;
public static final Version V_6_1_4 = new Version(V_6_1_4_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
- public static final int V_6_1_5_ID = 6010599;
- public static final Version V_6_1_5 = new Version(V_6_1_5_ID, org.apache.lucene.util.Version.LUCENE_7_1_0);
public static final int V_6_2_0_ID = 6020099;
public static final Version V_6_2_0 = new Version(V_6_2_0_ID, org.apache.lucene.util.Version.LUCENE_7_2_1);
public static final int V_6_2_1_ID = 6020199;
@@ -184,8 +184,6 @@ public static Version fromId(int id) {
return V_6_2_1;
case V_6_2_0_ID:
return V_6_2_0;
- case V_6_1_5_ID:
- return V_6_1_5;
case V_6_1_4_ID:
return V_6_1_4;
case V_6_1_3_ID:
@@ -413,6 +411,11 @@ public int compareTo(Version other) {
return Integer.compare(this.id, other.id);
}
+ @Override
+ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ return builder.value(toString());
+ }
+
/*
* We need the declared versions when computing the minimum compatibility version. As computing the declared versions uses reflection it
* is not cheap. Since computing the minimum compatibility version can occur often, we use this holder to compute the declared versions
diff --git a/server/src/main/java/org/elasticsearch/action/ActionModule.java b/server/src/main/java/org/elasticsearch/action/ActionModule.java
index 51abf6b0222e1..60ba0a43396e4 100644
--- a/server/src/main/java/org/elasticsearch/action/ActionModule.java
+++ b/server/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -275,6 +275,7 @@
import org.elasticsearch.rest.action.admin.indices.RestSyncedFlushAction;
import org.elasticsearch.rest.action.admin.indices.RestUpdateSettingsAction;
import org.elasticsearch.rest.action.admin.indices.RestUpgradeAction;
+import org.elasticsearch.rest.action.admin.indices.RestUpgradeStatusAction;
import org.elasticsearch.rest.action.admin.indices.RestValidateQueryAction;
import org.elasticsearch.rest.action.cat.AbstractCatAction;
import org.elasticsearch.rest.action.cat.RestAliasAction;
@@ -592,6 +593,7 @@ public void initRestHandlers(Supplier nodesInCluster) {
registerHandler.accept(new RestSyncedFlushAction(settings, restController));
registerHandler.accept(new RestForceMergeAction(settings, restController));
registerHandler.accept(new RestUpgradeAction(settings, restController));
+ registerHandler.accept(new RestUpgradeStatusAction(settings, restController));
registerHandler.accept(new RestClearIndicesCacheAction(settings, restController));
registerHandler.accept(new RestIndexAction(settings, restController));
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
index 598b1a526779e..bd5912b9853ec 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/health/TransportClusterHealthAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.cluster.health;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.ActiveShardCount;
@@ -104,7 +103,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
@Override
public void onFailure(String source, Exception e) {
- logger.error((Supplier) () -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
+ logger.error(() -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
listener.onFailure(e);
}
});
@@ -132,7 +131,7 @@ public void onNoLongerMaster(String source) {
@Override
public void onFailure(String source, Exception e) {
- logger.error((Supplier) () -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
+ logger.error(() -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
listener.onFailure(e);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
index 6e4d628ea5fc3..108ce586573d7 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/reroute/TransportClusterRerouteAction.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -112,7 +111,7 @@ public void onAckTimeout() {
@Override
public void onFailure(String source, Exception e) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to perform [{}]", source), e);
+ logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", source), e);
super.onFailure(source, e);
}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
index edc30bd3c35fd..4cf74fbf865cc 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/cluster/settings/TransportClusterUpdateSettingsAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.cluster.settings;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
@@ -160,7 +159,7 @@ public void onNoLongerMaster(String source) {
@Override
public void onFailure(String source, Exception e) {
//if the reroute fails we only log
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to perform [{}]", source), e);
+ logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", source), e);
listener.onFailure(new ElasticsearchException("reroute after update settings failed", e));
}
@@ -174,7 +173,7 @@ public ClusterState execute(final ClusterState currentState) {
@Override
public void onFailure(String source, Exception e) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to perform [{}]", source), e);
+ logger.debug(() -> new ParameterizedMessage("failed to perform [{}]", source), e);
super.onFailure(source, e);
}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
index 362f54b74ab36..0bd6370e88a57 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/close/TransportCloseIndexAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.close;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.DestructiveOperations;
@@ -114,7 +113,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
@Override
public void onFailure(Exception t) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to close indices [{}]", (Object) concreteIndices), t);
+ logger.debug(() -> new ParameterizedMessage("failed to close indices [{}]", (Object) concreteIndices), t);
listener.onFailure(t);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
index f5c63bd470d40..a2e102e0689c5 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/delete/TransportDeleteIndexAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.delete;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.DestructiveOperations;
@@ -102,7 +101,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
@Override
public void onFailure(Exception t) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to delete indices [{}]", concreteIndices), t);
+ logger.debug(() -> new ParameterizedMessage("failed to delete indices [{}]", concreteIndices), t);
listener.onFailure(t);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java
index f77bb5d6a57de..6ebbbbd34cd5b 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/forcemerge/ForceMergeResponse.java
@@ -21,7 +21,10 @@
import org.elasticsearch.action.support.DefaultShardOperationFailedException;
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
+import org.elasticsearch.common.xcontent.ConstructingObjectParser;
+import org.elasticsearch.common.xcontent.XContentParser;
+import java.util.Arrays;
import java.util.List;
/**
@@ -29,10 +32,25 @@
*/
public class ForceMergeResponse extends BroadcastResponse {
+ private static final ConstructingObjectParser PARSER = new ConstructingObjectParser<>("force_merge",
+ true, arg -> {
+ BroadcastResponse response = (BroadcastResponse) arg[0];
+ return new ForceMergeResponse(response.getTotalShards(), response.getSuccessfulShards(), response.getFailedShards(),
+ Arrays.asList(response.getShardFailures()));
+ });
+
+ static {
+ declareBroadcastFields(PARSER);
+ }
+
ForceMergeResponse() {
}
ForceMergeResponse(int totalShards, int successfulShards, int failedShards, List shardFailures) {
super(totalShards, successfulShards, failedShards, shardFailures);
}
+
+ public static ForceMergeResponse fromXContent(XContentParser parser) {
+ return PARSER.apply(parser, null);
+ }
}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
index d9ebf88fda6d7..f69670adf166d 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/TransportPutMappingAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.mapping.put;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -94,12 +93,12 @@ public void onResponse(ClusterStateUpdateResponse response) {
@Override
public void onFailure(Exception t) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", concreteIndices, request.type()), t);
+ logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", concreteIndices, request.type()), t);
listener.onFailure(t);
}
});
} catch (IndexNotFoundException ex) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", request.indices(), request.type()), ex);
+ logger.debug(() -> new ParameterizedMessage("failed to put mappings on indices [{}], type [{}]", request.indices(), request.type()), ex);
throw ex;
}
}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
index 795e11c228839..1e89244b67644 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/open/TransportOpenIndexAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.open;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.DestructiveOperations;
@@ -99,7 +98,7 @@ public void onResponse(OpenIndexClusterStateUpdateResponse response) {
@Override
public void onFailure(Exception t) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to open indices [{}]", (Object) concreteIndices), t);
+ logger.debug(() -> new ParameterizedMessage("failed to open indices [{}]", (Object) concreteIndices), t);
listener.onFailure(t);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
index 1a9c86049f8c6..7c51edc4d957e 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/RecoveryResponse.java
@@ -24,7 +24,6 @@
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.indices.recovery.RecoveryState;
@@ -37,9 +36,8 @@
/**
* Information regarding the recovery state of indices and their associated shards.
*/
-public class RecoveryResponse extends BroadcastResponse implements ToXContentFragment {
+public class RecoveryResponse extends BroadcastResponse {
- private boolean detailed = false;
private Map> shardRecoveryStates = new HashMap<>();
public RecoveryResponse() { }
@@ -51,36 +49,26 @@ public RecoveryResponse() { }
* @param totalShards Total count of shards seen
* @param successfulShards Count of shards successfully processed
* @param failedShards Count of shards which failed to process
- * @param detailed Display detailed metrics
* @param shardRecoveryStates Map of indices to shard recovery information
* @param shardFailures List of failures processing shards
*/
- public RecoveryResponse(int totalShards, int successfulShards, int failedShards, boolean detailed,
- Map> shardRecoveryStates,
+ public RecoveryResponse(int totalShards, int successfulShards, int failedShards, Map> shardRecoveryStates,
List shardFailures) {
super(totalShards, successfulShards, failedShards, shardFailures);
this.shardRecoveryStates = shardRecoveryStates;
- this.detailed = detailed;
}
public boolean hasRecoveries() {
return shardRecoveryStates.size() > 0;
}
- public boolean detailed() {
- return detailed;
- }
-
- public void detailed(boolean detailed) {
- this.detailed = detailed;
- }
-
public Map> shardRecoveryStates() {
return shardRecoveryStates;
}
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ builder.startObject();
if (hasRecoveries()) {
for (String index : shardRecoveryStates.keySet()) {
List recoveryStates = shardRecoveryStates.get(index);
@@ -98,6 +86,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
builder.endObject();
}
}
+ builder.endObject();
return builder;
}
@@ -133,4 +122,4 @@ public void readFrom(StreamInput in) throws IOException {
public String toString() {
return Strings.toString(this, true, true);
}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
index 0e11aed9d24fd..c67f5040cdd66 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/recovery/TransportRecoveryAction.java
@@ -87,7 +87,7 @@ protected RecoveryResponse newResponse(RecoveryRequest request, int totalShards,
shardResponses.get(indexName).add(recoveryState);
}
}
- return new RecoveryResponse(totalShards, successfulShards, failedShards, request.detailed(), shardResponses, shardFailures);
+ return new RecoveryResponse(totalShards, successfulShards, failedShards, shardResponses, shardFailures);
}
@Override
@@ -118,4 +118,4 @@ protected ClusterBlockException checkGlobalBlock(ClusterState state, RecoveryReq
protected ClusterBlockException checkRequestBlock(ClusterState state, RecoveryRequest request, String[] concreteIndices) {
return state.blocks().indicesBlockedException(ClusterBlockLevel.READ, concreteIndices);
}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
index e8e2f5376cd24..7faf24329dadd 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/segments/IndicesSegmentResponse.java
@@ -29,7 +29,6 @@
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.unit.ByteSizeValue;
-import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.engine.Segment;
@@ -43,7 +42,7 @@
import java.util.Map;
import java.util.Set;
-public class IndicesSegmentResponse extends BroadcastResponse implements ToXContentFragment {
+public class IndicesSegmentResponse extends BroadcastResponse {
private ShardSegments[] shards;
@@ -103,7 +102,7 @@ public void writeTo(StreamOutput out) throws IOException {
}
@Override
- public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ protected void addCustomXContentFields(XContentBuilder builder, Params params) throws IOException {
builder.startObject(Fields.INDICES);
for (IndexSegments indexSegments : getIndices().values()) {
@@ -173,10 +172,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
}
builder.endObject();
- return builder;
}
- static void toXContent(XContentBuilder builder, Sort sort) throws IOException {
+ private static void toXContent(XContentBuilder builder, Sort sort) throws IOException {
builder.startArray("sort");
for (SortField field : sort.getSort()) {
builder.startObject();
@@ -195,7 +193,7 @@ static void toXContent(XContentBuilder builder, Sort sort) throws IOException {
builder.endArray();
}
- static void toXContent(XContentBuilder builder, Accountable tree) throws IOException {
+ private static void toXContent(XContentBuilder builder, Accountable tree) throws IOException {
builder.startObject();
builder.field(Fields.DESCRIPTION, tree.toString());
builder.humanReadableField(Fields.SIZE_IN_BYTES, Fields.SIZE, new ByteSizeValue(tree.ramBytesUsed()));
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
index d20957c4bd29b..83eca83310339 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/settings/put/TransportUpdateSettingsAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.settings.put;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -94,7 +93,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
@Override
public void onFailure(Exception t) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to update settings on indices [{}]", (Object) concreteIndices), t);
+ logger.debug(() -> new ParameterizedMessage("failed to update settings on indices [{}]", (Object) concreteIndices), t);
listener.onFailure(t);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
index 46aef007e6bab..7406dc4f2d12c 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/stats/IndicesStatsResponse.java
@@ -25,9 +25,7 @@
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
import java.io.IOException;
import java.util.ArrayList;
@@ -39,7 +37,7 @@
import static java.util.Collections.unmodifiableMap;
-public class IndicesStatsResponse extends BroadcastResponse implements ToXContentFragment {
+public class IndicesStatsResponse extends BroadcastResponse {
private ShardStats[] shards;
@@ -147,7 +145,7 @@ public void writeTo(StreamOutput out) throws IOException {
}
@Override
- public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ protected void addCustomXContentFields(XContentBuilder builder, Params params) throws IOException {
final String level = params.param("level", "indices");
final boolean isLevelValid =
"cluster".equalsIgnoreCase(level) || "indices".equalsIgnoreCase(level) || "shards".equalsIgnoreCase(level);
@@ -155,7 +153,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
throw new IllegalArgumentException("level parameter must be one of [cluster] or [indices] or [shards] but was [" + level + "]");
}
-
builder.startObject("_all");
builder.startObject("primaries");
@@ -198,8 +195,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
}
builder.endObject();
}
-
- return builder;
}
static final class Fields {
@@ -209,14 +204,6 @@ static final class Fields {
@Override
public String toString() {
- try {
- XContentBuilder builder = XContentFactory.jsonBuilder().prettyPrint();
- builder.startObject();
- toXContent(builder, EMPTY_PARAMS);
- builder.endObject();
- return Strings.toString(builder);
- } catch (IOException e) {
- return "{ \"error\" : \"" + e.getMessage() + "\"}";
- }
+ return Strings.toString(this, true, false);
}
}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
index ad9f73b55b0cb..db5ddd326d736 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/delete/TransportDeleteIndexTemplateAction.java
@@ -19,7 +19,6 @@
package org.elasticsearch.action.admin.indices.template.delete;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -75,7 +74,7 @@ public void onResponse(MetaDataIndexTemplateService.RemoveResponse response) {
@Override
public void onFailure(Exception e) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to delete templates [{}]", request.name()), e);
+ logger.debug(() -> new ParameterizedMessage("failed to delete templates [{}]", request.name()), e);
listener.onFailure(e);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
index 1624c7950e7f2..7b46dc602d0ce 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/template/put/TransportPutIndexTemplateAction.java
@@ -19,7 +19,6 @@
package org.elasticsearch.action.admin.indices.template.put;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -97,7 +96,7 @@ public void onResponse(MetaDataIndexTemplateService.PutResponse response) {
@Override
public void onFailure(Exception e) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to put template [{}]", request.name()), e);
+ logger.debug(() -> new ParameterizedMessage("failed to put template [{}]", request.name()), e);
listener.onFailure(e);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
index 71110f18b875c..a45b8feda89ce 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/get/UpgradeStatusResponse.java
@@ -23,7 +23,6 @@
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
-import org.elasticsearch.common.xcontent.ToXContentFragment;
import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
@@ -34,7 +33,7 @@
import java.util.Map;
import java.util.Set;
-public class UpgradeStatusResponse extends BroadcastResponse implements ToXContentFragment {
+public class UpgradeStatusResponse extends BroadcastResponse {
private ShardUpgradeStatus[] shards;
private Map indicesUpgradeStatus;
@@ -116,6 +115,7 @@ public long getToUpgradeBytesAncient() {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ builder.startObject();
builder.byteSizeField(Fields.SIZE_IN_BYTES, Fields.SIZE, getTotalBytes());
builder.byteSizeField(Fields.SIZE_TO_UPGRADE_IN_BYTES, Fields.SIZE_TO_UPGRADE, getToUpgradeBytes());
builder.byteSizeField(Fields.SIZE_TO_UPGRADE_ANCIENT_IN_BYTES, Fields.SIZE_TO_UPGRADE_ANCIENT, getToUpgradeBytesAncient());
@@ -161,6 +161,7 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
}
builder.endObject();
}
+ builder.endObject();
return builder;
}
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
index 02d58a9db7ece..2e428e85efc23 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/TransportUpgradeSettingsAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.admin.indices.upgrade.post;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
@@ -78,7 +77,7 @@ public void onResponse(ClusterStateUpdateResponse response) {
@Override
public void onFailure(Exception t) {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to upgrade minimum compatibility version settings on indices [{}]", request.versions().keySet()), t);
+ logger.debug(() -> new ParameterizedMessage("failed to upgrade minimum compatibility version settings on indices [{}]", request.versions().keySet()), t);
listener.onFailure(t);
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
index db49921d43532..4a760e273a0fa 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/upgrade/post/UpgradeResponse.java
@@ -25,6 +25,7 @@
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
import java.util.HashMap;
@@ -74,6 +75,18 @@ public void writeTo(StreamOutput out) throws IOException {
}
}
+ @Override
+ protected void addCustomXContentFields(XContentBuilder builder, Params params) throws IOException {
+ builder.startObject("upgraded_indices");
+ for (Map.Entry> entry : versions.entrySet()) {
+ builder.startObject(entry.getKey());
+ builder.field("upgrade_version", entry.getValue().v1());
+ builder.field("oldest_lucene_segment_version", entry.getValue().v2());
+ builder.endObject();
+ }
+ builder.endObject();
+ }
+
/**
* Returns the highest upgrade version of the node that performed metadata upgrade and the
* the version of the oldest lucene segment for each index that was upgraded.
diff --git a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
index eff37ff4b0cb4..5bb11dd56e00b 100644
--- a/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/admin/indices/validate/query/ValidateQueryResponse.java
@@ -23,6 +23,7 @@
import org.elasticsearch.action.support.broadcast.BroadcastResponse;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.xcontent.XContentBuilder;
import java.io.IOException;
import java.util.ArrayList;
@@ -38,8 +39,15 @@
*/
public class ValidateQueryResponse extends BroadcastResponse {
+ public static final String INDEX_FIELD = "index";
+ public static final String SHARD_FIELD = "shard";
+ public static final String VALID_FIELD = "valid";
+ public static final String EXPLANATIONS_FIELD = "explanations";
+ public static final String ERROR_FIELD = "error";
+ public static final String EXPLANATION_FIELD = "explanation";
+
private boolean valid;
-
+
private List queryExplanations;
ValidateQueryResponse() {
@@ -96,4 +104,30 @@ public void writeTo(StreamOutput out) throws IOException {
}
}
+
+ @Override
+ protected void addCustomXContentFields(XContentBuilder builder, Params params) throws IOException {
+ builder.field(VALID_FIELD, isValid());
+ if (getQueryExplanation() != null && !getQueryExplanation().isEmpty()) {
+ builder.startArray(EXPLANATIONS_FIELD);
+ for (QueryExplanation explanation : getQueryExplanation()) {
+ builder.startObject();
+ if (explanation.getIndex() != null) {
+ builder.field(INDEX_FIELD, explanation.getIndex());
+ }
+ if(explanation.getShard() >= 0) {
+ builder.field(SHARD_FIELD, explanation.getShard());
+ }
+ builder.field(VALID_FIELD, explanation.isValid());
+ if (explanation.getError() != null) {
+ builder.field(ERROR_FIELD, explanation.getError());
+ }
+ if (explanation.getExplanation() != null) {
+ builder.field(EXPLANATION_FIELD, explanation.getExplanation());
+ }
+ builder.endObject();
+ }
+ builder.endArray();
+ }
+ }
}
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java
index 423648bbb7105..adb1d32161fe1 100644
--- a/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java
+++ b/server/src/main/java/org/elasticsearch/action/bulk/BulkRequestHandler.java
@@ -20,7 +20,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.Settings;
@@ -89,10 +88,10 @@ public void onFailure(Exception e) {
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- logger.info((Supplier) () -> new ParameterizedMessage("Bulk request {} has been cancelled.", executionId), e);
+ logger.info(() -> new ParameterizedMessage("Bulk request {} has been cancelled.", executionId), e);
listener.afterBulk(executionId, bulkRequest, e);
} catch (Exception e) {
- logger.warn((Supplier) () -> new ParameterizedMessage("Failed to execute bulk request {}.", executionId), e);
+ logger.warn(() -> new ParameterizedMessage("Failed to execute bulk request {}.", executionId), e);
listener.afterBulk(executionId, bulkRequest, e);
} finally {
if (bulkRequestSetupSuccessful == false) { // if we fail on client.bulk() release the semaphore
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
index f756c629b9832..5a3544377155c 100644
--- a/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
+++ b/server/src/main/java/org/elasticsearch/action/bulk/TransportBulkAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.bulk;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.util.SparseFixedBitSet;
import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.ExceptionsHelper;
@@ -494,7 +493,7 @@ void processBulkIndexIngestRequest(Task task, BulkRequest original, ActionListen
long ingestStartTimeInNanos = System.nanoTime();
BulkRequestModifier bulkRequestModifier = new BulkRequestModifier(original);
ingestService.getPipelineExecutionService().executeBulkRequest(() -> bulkRequestModifier, (indexRequest, exception) -> {
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to execute pipeline [{}] for document [{}/{}/{}]",
+ logger.debug(() -> new ParameterizedMessage("failed to execute pipeline [{}] for document [{}/{}/{}]",
indexRequest.getPipeline(), indexRequest.index(), indexRequest.type(), indexRequest.id()), exception);
bulkRequestModifier.markCurrentItemAsFailed(exception);
}, (exception) -> {
diff --git a/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
index e66df2b0d9267..7221118d2ef50 100644
--- a/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
+++ b/server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.action.DocWriteResponse;
@@ -197,10 +196,10 @@ static BulkItemResponse createPrimaryResponse(BulkItemResultHolder bulkItemResul
DocWriteRequest docWriteRequest = replicaRequest.request();
Exception failure = operationResult.getFailure();
if (isConflictException(failure)) {
- logger.trace((Supplier) () -> new ParameterizedMessage("{} failed to execute bulk item ({}) {}",
+ logger.trace(() -> new ParameterizedMessage("{} failed to execute bulk item ({}) {}",
request.shardId(), docWriteRequest.opType().getLowercase(), request), failure);
} else {
- logger.debug((Supplier) () -> new ParameterizedMessage("{} failed to execute bulk item ({}) {}",
+ logger.debug(() -> new ParameterizedMessage("{} failed to execute bulk item ({}) {}",
request.shardId(), docWriteRequest.opType().getLowercase(), request), failure);
}
diff --git a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
index 8353c5dc389d9..d15b7b92d62aa 100644
--- a/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
+++ b/server/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.get;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.TransportActions;
@@ -95,7 +94,7 @@ protected MultiGetShardResponse shardOperation(MultiGetShardRequest request, Sha
if (TransportActions.isShardNotAvailableException(e)) {
throw (ElasticsearchException) e;
} else {
- logger.debug((Supplier) () -> new ParameterizedMessage("{} failed to execute multi_get for [{}]/[{}]", shardId,
+ logger.debug(() -> new ParameterizedMessage("{} failed to execute multi_get for [{}]/[{}]", shardId,
item.type(), item.id()), e);
response.add(request.locations.get(i), new MultiGetResponse.Failure(request.index(), item.type(), item.id(), e));
}
diff --git a/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java
index d6d7cea7704fc..aad2638bd9de3 100644
--- a/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java
+++ b/server/src/main/java/org/elasticsearch/action/search/AbstractSearchAsyncAction.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.util.SetOnce;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ExceptionsHelper;
@@ -125,10 +124,7 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
final ShardOperationFailedException[] shardSearchFailures = ExceptionsHelper.groupBy(buildShardFailures());
Throwable cause = shardSearchFailures.length == 0 ? null :
ElasticsearchException.guessRootCauses(shardSearchFailures[0].getCause())[0];
- if (logger.isDebugEnabled()) {
- logger.debug((Supplier) () -> new ParameterizedMessage("All shards failed for phase: [{}]", getName()),
- cause);
- }
+ logger.debug(() -> new ParameterizedMessage("All shards failed for phase: [{}]", getName()), cause);
onPhaseFailure(currentPhase, "all shards failed", cause);
} else {
Boolean allowPartialResults = request.allowPartialSearchResults();
@@ -138,9 +134,8 @@ public final void executeNextPhase(SearchPhase currentPhase, SearchPhase nextPha
final ShardOperationFailedException[] shardSearchFailures = ExceptionsHelper.groupBy(buildShardFailures());
Throwable cause = shardSearchFailures.length == 0 ? null :
ElasticsearchException.guessRootCauses(shardSearchFailures[0].getCause())[0];
- logger.debug((Supplier) () -> new ParameterizedMessage("{} shards failed for phase: [{}]",
- shardSearchFailures.length, getName()),
- cause);
+ logger.debug(() -> new ParameterizedMessage("{} shards failed for phase: [{}]",
+ shardSearchFailures.length, getName()), cause);
}
onPhaseFailure(currentPhase, "Partial shards failure", null);
} else {
@@ -160,10 +155,7 @@ private void executePhase(SearchPhase phase) {
phase.run();
} catch (Exception e) {
if (logger.isDebugEnabled()) {
- logger.debug(
- (Supplier) () -> new ParameterizedMessage(
- "Failed to execute [{}] while moving to [{}] phase", request, phase.getName()),
- e);
+ logger.debug(new ParameterizedMessage("Failed to execute [{}] while moving to [{}] phase", request, phase.getName()), e);
}
onPhaseFailure(phase, "", e);
}
diff --git a/server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java b/server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java
index ac708d9b6b0c7..9b98691dc9005 100644
--- a/server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java
+++ b/server/src/main/java/org/elasticsearch/action/search/ClearScrollController.java
@@ -20,7 +20,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
@@ -133,7 +132,7 @@ private void onFreedContext(boolean freed) {
}
private void onFailedFreedContext(Throwable e, DiscoveryNode node) {
- logger.warn((Supplier) () -> new ParameterizedMessage("Clear SC failed on node[{}]", node), e);
+ logger.warn(() -> new ParameterizedMessage("Clear SC failed on node[{}]", node), e);
if (expectedOps.countDown()) {
listener.onResponse(new ClearScrollResponse(false, freedSearchContexts.get()));
} else {
diff --git a/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java b/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java
index db0425db7c320..1d8d702520e4c 100644
--- a/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java
+++ b/server/src/main/java/org/elasticsearch/action/search/DfsQueryPhase.java
@@ -19,7 +19,6 @@
package org.elasticsearch.action.search;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.common.util.concurrent.AtomicArray;
import org.elasticsearch.search.SearchPhaseResult;
import org.elasticsearch.search.SearchShardTarget;
@@ -87,10 +86,8 @@ protected void innerOnResponse(QuerySearchResult response) {
@Override
public void onFailure(Exception exception) {
try {
- if (context.getLogger().isDebugEnabled()) {
- context.getLogger().debug((Supplier) () -> new ParameterizedMessage("[{}] Failed to execute query phase",
- querySearchRequest.id()), exception);
- }
+ context.getLogger().debug(() -> new ParameterizedMessage("[{}] Failed to execute query phase",
+ querySearchRequest.id()), exception);
counter.onFailure(shardIndex, searchShardTarget, exception);
} finally {
// the query might not have been executed at all (for example because thread pool rejected
diff --git a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java
index 4712496bc37ec..920353abcf808 100644
--- a/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java
+++ b/server/src/main/java/org/elasticsearch/action/search/FetchSearchPhase.java
@@ -21,7 +21,6 @@
import com.carrotsearch.hppc.IntArrayList;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.search.ScoreDoc;
import org.elasticsearch.action.ActionRunnable;
import org.elasticsearch.action.OriginalIndices;
@@ -169,10 +168,7 @@ public void innerOnResponse(FetchSearchResult result) {
@Override
public void onFailure(Exception e) {
try {
- if (logger.isDebugEnabled()) {
- logger.debug((Supplier) () -> new ParameterizedMessage("[{}] Failed to execute fetch phase",
- fetchSearchRequest.id()), e);
- }
+ logger.debug(() -> new ParameterizedMessage("[{}] Failed to execute fetch phase", fetchSearchRequest.id()), e);
counter.onFailure(shardIndex, shardTarget, e);
} finally {
// the search context might not be cleared on the node where the fetch was executed for example
diff --git a/server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java b/server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java
index 01f31d4c7439f..559c7ca102e6b 100644
--- a/server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java
+++ b/server/src/main/java/org/elasticsearch/action/search/InitialSearchPhase.java
@@ -20,7 +20,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.NoShardAvailableActionException;
import org.elasticsearch.action.support.TransportActions;
import org.elasticsearch.cluster.routing.GroupShardsIterator;
@@ -93,15 +92,10 @@ private void onShardFailure(final int shardIndex, @Nullable ShardRouting shard,
if (totalOps.incrementAndGet() == expectedTotalOps) {
if (logger.isDebugEnabled()) {
if (e != null && !TransportActions.isShardNotAvailableException(e)) {
- logger.debug(
- (Supplier) () -> new ParameterizedMessage(
- "{}: Failed to execute [{}]",
- shard != null ? shard.shortSummary() :
- shardIt.shardId(),
- request),
- e);
+ logger.debug(new ParameterizedMessage(
+ "{}: Failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(), request), e);
} else if (logger.isTraceEnabled()) {
- logger.trace((Supplier) () -> new ParameterizedMessage("{}: Failed to execute [{}]", shard, request), e);
+ logger.trace(new ParameterizedMessage("{}: Failed to execute [{}]", shard, request), e);
}
}
onPhaseDone();
@@ -109,13 +103,9 @@ private void onShardFailure(final int shardIndex, @Nullable ShardRouting shard,
final ShardRouting nextShard = shardIt.nextOrNull();
final boolean lastShard = nextShard == null;
// trace log this exception
- logger.trace(
- (Supplier) () -> new ParameterizedMessage(
- "{}: Failed to execute [{}] lastShard [{}]",
- shard != null ? shard.shortSummary() : shardIt.shardId(),
- request,
- lastShard),
- e);
+ logger.trace(() -> new ParameterizedMessage(
+ "{}: Failed to execute [{}] lastShard [{}]",
+ shard != null ? shard.shortSummary() : shardIt.shardId(), request, lastShard), e);
if (!lastShard) {
performPhaseOnShard(shardIndex, shardIt, nextShard);
} else {
@@ -123,14 +113,9 @@ private void onShardFailure(final int shardIndex, @Nullable ShardRouting shard,
// no more shards active, add a failure
if (logger.isDebugEnabled() && !logger.isTraceEnabled()) { // do not double log this exception
if (e != null && !TransportActions.isShardNotAvailableException(e)) {
- logger.debug(
- (Supplier) () -> new ParameterizedMessage(
- "{}: Failed to execute [{}] lastShard [{}]",
- shard != null ? shard.shortSummary() :
- shardIt.shardId(),
- request,
- lastShard),
- e);
+ logger.debug(new ParameterizedMessage(
+ "{}: Failed to execute [{}] lastShard [{}]",
+ shard != null ? shard.shortSummary() : shardIt.shardId(), request, lastShard), e);
}
}
}
diff --git a/server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java b/server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
index 10719fcb91c6a..c584db106992c 100644
--- a/server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/HandledTransportAction.java
@@ -91,13 +91,8 @@ public void onFailure(Exception e) {
try {
channel.sendResponse(e);
} catch (Exception e1) {
- logger.warn(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
- "Failed to send error response for action [{}] and request [{}]",
- actionName,
- request),
- e1);
+ logger.warn(() -> new ParameterizedMessage(
+ "Failed to send error response for action [{}] and request [{}]", actionName, request), e1);
}
}
});
diff --git a/server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java b/server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
index 759693e550e1e..dfcf6445abf7d 100644
--- a/server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
+++ b/server/src/main/java/org/elasticsearch/action/support/ThreadedActionListener.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.action.ActionListener;
import org.elasticsearch.client.Client;
import org.elasticsearch.client.transport.TransportClient;
@@ -120,8 +119,7 @@ protected void doRun() throws Exception {
@Override
public void onFailure(Exception e) {
- logger.warn(
- (Supplier) () -> new ParameterizedMessage("failed to execute failure callback on [{}]", listener), e);
+ logger.warn(() -> new ParameterizedMessage("failed to execute failure callback on [{}]", listener), e);
}
});
}
diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
index ce812644faea6..47bc50be330b6 100644
--- a/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
+++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastResponse.java
@@ -25,7 +25,7 @@
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.ConstructingObjectParser;
-import org.elasticsearch.common.xcontent.ToXContentFragment;
+import org.elasticsearch.common.xcontent.ToXContentObject;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.rest.RestStatus;
import org.elasticsearch.rest.action.RestActions;
@@ -40,7 +40,7 @@
/**
* Base class for all broadcast operation based responses.
*/
-public class BroadcastResponse extends ActionResponse implements ToXContentFragment {
+public class BroadcastResponse extends ActionResponse implements ToXContentObject {
public static final DefaultShardOperationFailedException[] EMPTY = new DefaultShardOperationFailedException[0];
@@ -149,7 +149,16 @@ public void writeTo(StreamOutput out) throws IOException {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
+ builder.startObject();
RestActions.buildBroadcastShardsHeader(builder, params, this);
+ addCustomXContentFields(builder, params);
+ builder.endObject();
return builder;
}
+
+ /**
+ * Override in subclass to add custom fields following the common `_shards` field
+ */
+ protected void addCustomXContentFields(XContentBuilder builder, Params params) throws IOException {
+ }
}
diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
index 53764f4ee88d6..0961ab74c4703 100644
--- a/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastAction.java
@@ -222,13 +222,8 @@ void onOperation(@Nullable ShardRouting shard, final ShardIterator shardIt, int
if (e != null) {
if (logger.isTraceEnabled()) {
if (!TransportActions.isShardNotAvailableException(e)) {
- logger.trace(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
- "{}: failed to execute [{}]",
- shard != null ? shard.shortSummary() : shardIt.shardId(),
- request),
- e);
+ logger.trace(new ParameterizedMessage(
+ "{}: failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(), request), e);
}
}
}
@@ -237,13 +232,8 @@ void onOperation(@Nullable ShardRouting shard, final ShardIterator shardIt, int
if (logger.isDebugEnabled()) {
if (e != null) {
if (!TransportActions.isShardNotAvailableException(e)) {
- logger.debug(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
- "{}: failed to execute [{}]",
- shard != null ? shard.shortSummary() : shardIt.shardId(),
- request),
- e);
+ logger.debug(new ParameterizedMessage(
+ "{}: failed to execute [{}]", shard != null ? shard.shortSummary() : shardIt.shardId(), request), e);
}
}
}
diff --git a/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java
index b6eaa5163c865..ff4e73acc1877 100644
--- a/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/broadcast/node/TransportBroadcastByNodeAction.java
@@ -362,9 +362,7 @@ protected void onNodeResponse(DiscoveryNode node, int nodeIndex, NodeResponse re
protected void onNodeFailure(DiscoveryNode node, int nodeIndex, Throwable t) {
String nodeId = node.getId();
if (logger.isDebugEnabled() && !(t instanceof NodeShouldNotConnectException)) {
- logger.debug(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("failed to execute [{}] on node [{}]", actionName, nodeId), t);
+ logger.debug(new ParameterizedMessage("failed to execute [{}] on node [{}]", actionName, nodeId), t);
}
// this is defensive to protect against the possibility of double invocation
@@ -441,23 +439,13 @@ private void onShardOperation(final NodeRequest request, final Object[] shardRes
shardResults[shardIndex] = failure;
if (TransportActions.isShardNotAvailableException(e)) {
if (logger.isTraceEnabled()) {
- logger.trace(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
- "[{}] failed to execute operation for shard [{}]",
- actionName,
- shardRouting.shortSummary()),
- e);
+ logger.trace(new ParameterizedMessage(
+ "[{}] failed to execute operation for shard [{}]", actionName, shardRouting.shortSummary()), e);
}
} else {
if (logger.isDebugEnabled()) {
- logger.debug(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
- "[{}] failed to execute operation for shard [{}]",
- actionName,
- shardRouting.shortSummary()),
- e);
+ logger.debug(new ParameterizedMessage(
+ "[{}] failed to execute operation for shard [{}]", actionName, shardRouting.shortSummary()), e);
}
}
}
diff --git a/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
index 3f72f41345a3d..4f24a523f762d 100644
--- a/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/master/TransportMasterNodeAction.java
@@ -154,7 +154,7 @@ public void onResponse(Response response) {
public void onFailure(Exception t) {
if (t instanceof Discovery.FailedToCommitClusterStateException
|| (t instanceof NotMasterException)) {
- logger.debug((org.apache.logging.log4j.util.Supplier) () -> new ParameterizedMessage("master could not publish cluster state or stepped down before publishing action [{}], scheduling a retry", actionName), t);
+ logger.debug(() -> new ParameterizedMessage("master could not publish cluster state or stepped down before publishing action [{}], scheduling a retry", actionName), t);
retry(t, masterChangePredicate);
} else {
listener.onFailure(t);
@@ -209,7 +209,7 @@ public void onClusterServiceClose() {
@Override
public void onTimeout(TimeValue timeout) {
- logger.debug((org.apache.logging.log4j.util.Supplier) () -> new ParameterizedMessage("timed out while retrying [{}] after failure (timeout [{}])", actionName, timeout), failure);
+ logger.debug(() -> new ParameterizedMessage("timed out while retrying [{}] after failure (timeout [{}])", actionName, timeout), failure);
listener.onFailure(new MasterNotDiscoveredException(failure));
}
}, statePredicate
diff --git a/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java b/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
index 4583e47bc1db7..0b61c7ed71247 100644
--- a/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/nodes/TransportNodesAction.java
@@ -232,9 +232,7 @@ private void onOperation(int idx, NodeResponse nodeResponse) {
private void onFailure(int idx, String nodeId, Throwable t) {
if (logger.isDebugEnabled() && !(t instanceof NodeShouldNotConnectException)) {
- logger.debug(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("failed to execute on node [{}]", nodeId), t);
+ logger.debug(new ParameterizedMessage("failed to execute on node [{}]", nodeId), t);
}
responses.set(idx, new FailedNodeException(nodeId, "Failed node [" + nodeId + "]", t));
if (counter.incrementAndGet() == responses.length()) {
diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java
index c29ca5c1d0853..340496ca35363 100644
--- a/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java
+++ b/server/src/main/java/org/elasticsearch/action/support/replication/ReplicationOperation.java
@@ -178,7 +178,7 @@ public void onResponse(ReplicaResponse response) {
@Override
public void onFailure(Exception replicaException) {
- logger.trace((org.apache.logging.log4j.util.Supplier) () -> new ParameterizedMessage(
+ logger.trace(() -> new ParameterizedMessage(
"[{}] failure while performing [{}] on replica {}, request [{}]",
shard.shardId(), opType, shard, replicaRequest), replicaException);
// Only report "critical" exceptions - TODO: Reach out to the master node to get the latest shard state then report.
diff --git a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
index 2cd5f7a5f13ac..aca8ed4973263 100644
--- a/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/replication/TransportReplicationAction.java
@@ -265,9 +265,7 @@ public void onFailure(Exception e) {
channel.sendResponse(e);
} catch (Exception inner) {
inner.addSuppressed(e);
- logger.warn(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("Failed to send response for {}", actionName), inner);
+ logger.warn(() -> new ParameterizedMessage("Failed to send response for {}", actionName), inner);
}
}
});
@@ -579,7 +577,6 @@ public void onResponse(Releasable releasable) {
public void onFailure(Exception e) {
if (e instanceof RetryOnReplicaException) {
logger.trace(
- (org.apache.logging.log4j.util.Supplier)
() -> new ParameterizedMessage(
"Retrying operation on replica, action [{}], request [{}]",
transportReplicaAction,
@@ -621,12 +618,8 @@ protected void responseWithFailure(Exception e) {
channel.sendResponse(e);
} catch (IOException responseException) {
responseException.addSuppressed(e);
- logger.warn(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
- "failed to send error message back to client for action [{}]",
- transportReplicaAction),
- responseException);
+ logger.warn(() -> new ParameterizedMessage(
+ "failed to send error message back to client for action [{}]", transportReplicaAction), responseException);
}
}
@@ -854,12 +847,9 @@ public void handleException(TransportException exp) {
final Throwable cause = exp.unwrapCause();
if (cause instanceof ConnectTransportException || cause instanceof NodeClosedException ||
(isPrimaryAction && retryPrimaryException(cause))) {
- logger.trace(
- (org.apache.logging.log4j.util.Supplier) () -> new ParameterizedMessage(
+ logger.trace(() -> new ParameterizedMessage(
"received an error from node [{}] for request [{}], scheduling a retry",
- node.getId(),
- requestToPerform),
- exp);
+ node.getId(), requestToPerform), exp);
retry(exp);
} else {
finishAsFailed(exp);
@@ -903,9 +893,7 @@ public void onTimeout(TimeValue timeout) {
void finishAsFailed(Exception failure) {
if (finished.compareAndSet(false, true)) {
setPhase(task, "failed");
- logger.trace(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("operation failed. action [{}], request [{}]", actionName, request), failure);
+ logger.trace(() -> new ParameterizedMessage("operation failed. action [{}], request [{}]", actionName, request), failure);
listener.onFailure(failure);
} else {
assert false : "finishAsFailed called but operation is already finished";
@@ -913,13 +901,9 @@ void finishAsFailed(Exception failure) {
}
void finishWithUnexpectedFailure(Exception failure) {
- logger.warn(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage(
+ logger.warn(() -> new ParameterizedMessage(
"unexpected error during the primary phase for action [{}], request [{}]",
- actionName,
- request),
- failure);
+ actionName, request), failure);
if (finished.compareAndSet(false, true)) {
setPhase(task, "failed");
listener.onFailure(failure);
diff --git a/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
index 0b9069e9608f6..eae8ede4e1f38 100644
--- a/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/single/shard/TransportSingleShardAction.java
@@ -188,10 +188,8 @@ public void handleException(TransportException exp) {
}
private void onFailure(ShardRouting shardRouting, Exception e) {
- if (logger.isTraceEnabled() && e != null) {
- logger.trace(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("{}: failed to execute [{}]", shardRouting, internalRequest.request()), e);
+ if (e != null) {
+ logger.trace(() -> new ParameterizedMessage("{}: failed to execute [{}]", shardRouting, internalRequest.request()), e);
}
perform(e);
}
@@ -208,11 +206,7 @@ private void perform(@Nullable final Exception currentFailure) {
if (failure == null || isShardNotAvailableException(failure)) {
failure = new NoShardAvailableActionException(null, LoggerMessageFormat.format("No shard available for [{}]", internalRequest.request()), failure);
} else {
- if (logger.isDebugEnabled()) {
- logger.debug(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("{}: failed to execute [{}]", null, internalRequest.request()), failure);
- }
+ logger.debug(() -> new ParameterizedMessage("{}: failed to execute [{}]", null, internalRequest.request()), failure);
}
listener.onFailure(failure);
return;
diff --git a/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java b/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java
index 35b2b41dfda6e..aad7d20073c3b 100644
--- a/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java
+++ b/server/src/main/java/org/elasticsearch/action/support/tasks/TransportTasksAction.java
@@ -315,9 +315,7 @@ private void onOperation(int idx, NodeTasksResponse nodeResponse) {
private void onFailure(int idx, String nodeId, Throwable t) {
if (logger.isDebugEnabled() && !(t instanceof NodeShouldNotConnectException)) {
- logger.debug(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("failed to execute on node [{}]", nodeId), t);
+ logger.debug(new ParameterizedMessage("failed to execute on node [{}]", nodeId), t);
}
responses.set(idx, new FailedNodeException(nodeId, "Failed node [" + nodeId + "]", t));
diff --git a/server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java b/server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
index 8c1d06113d684..b83ac3881fda5 100644
--- a/server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
+++ b/server/src/main/java/org/elasticsearch/action/termvectors/TransportShardMultiTermsVectorAction.java
@@ -20,7 +20,6 @@
package org.elasticsearch.action.termvectors;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.TransportActions;
@@ -89,7 +88,7 @@ protected MultiTermVectorsShardResponse shardOperation(MultiTermVectorsShardRequ
if (TransportActions.isShardNotAvailableException(t)) {
throw (ElasticsearchException) t;
} else {
- logger.debug((Supplier) () -> new ParameterizedMessage("{} failed to execute multi term vectors for [{}]/[{}]", shardId, termVectorsRequest.type(), termVectorsRequest.id()), t);
+ logger.debug(() -> new ParameterizedMessage("{} failed to execute multi term vectors for [{}]/[{}]", shardId, termVectorsRequest.type(), termVectorsRequest.id()), t);
response.add(request.locations.get(i),
new MultiTermVectorsResponse.Failure(request.index(), termVectorsRequest.type(), termVectorsRequest.id(), t));
}
diff --git a/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java
index 5335b4be8b4e2..19fdb8837d69b 100644
--- a/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java
+++ b/server/src/main/java/org/elasticsearch/bootstrap/BootstrapChecks.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.util.Constants;
import org.elasticsearch.common.SuppressForbidden;
import org.elasticsearch.common.io.PathUtils;
@@ -428,15 +427,11 @@ long getMaxMapCount(Logger logger) {
try {
return parseProcSysVmMaxMapCount(rawProcSysVmMaxMapCount);
} catch (final NumberFormatException e) {
- logger.warn(
- (Supplier) () -> new ParameterizedMessage(
- "unable to parse vm.max_map_count [{}]",
- rawProcSysVmMaxMapCount),
- e);
+ logger.warn(() -> new ParameterizedMessage("unable to parse vm.max_map_count [{}]", rawProcSysVmMaxMapCount), e);
}
}
} catch (final IOException e) {
- logger.warn((Supplier) () -> new ParameterizedMessage("I/O exception while trying to read [{}]", path), e);
+ logger.warn(() -> new ParameterizedMessage("I/O exception while trying to read [{}]", path), e);
}
return -1;
}
diff --git a/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java b/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java
index 6869a6abb710f..857ff65b6c2b8 100644
--- a/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java
+++ b/server/src/main/java/org/elasticsearch/bootstrap/ElasticsearchUncaughtExceptionHandler.java
@@ -71,15 +71,12 @@ static boolean isFatalUncaught(Throwable e) {
void onFatalUncaught(final String threadName, final Throwable t) {
final Logger logger = Loggers.getLogger(ElasticsearchUncaughtExceptionHandler.class, loggingPrefixSupplier.get());
- logger.error(
- (org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("fatal error in thread [{}], exiting", threadName), t);
+ logger.error(() -> new ParameterizedMessage("fatal error in thread [{}], exiting", threadName), t);
}
void onNonFatalUncaught(final String threadName, final Throwable t) {
final Logger logger = Loggers.getLogger(ElasticsearchUncaughtExceptionHandler.class, loggingPrefixSupplier.get());
- logger.warn((org.apache.logging.log4j.util.Supplier)
- () -> new ParameterizedMessage("uncaught exception in thread [{}]", threadName), t);
+ logger.warn(() -> new ParameterizedMessage("uncaught exception in thread [{}]", threadName), t);
}
void halt(int status) {
diff --git a/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java b/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
index 5d31e74bef621..109efb400bc93 100644
--- a/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
+++ b/server/src/main/java/org/elasticsearch/client/transport/TransportClientNodesService.java
@@ -373,7 +373,7 @@ protected List validateNewNodes(Set nodes) {
transportService.connectToNode(node);
} catch (Exception e) {
it.remove();
- logger.debug((Supplier) () -> new ParameterizedMessage("failed to connect to discovered node [{}]", node), e);
+ logger.debug(() -> new ParameterizedMessage("failed to connect to discovered node [{}]", node), e);
}
}
}
@@ -428,13 +428,10 @@ public LivenessResponse newInstance() {
nodeWithInfo.getAttributes(), nodeWithInfo.getRoles(), nodeWithInfo.getVersion()));
}
} catch (ConnectTransportException e) {
- logger.debug(
- (Supplier)
- () -> new ParameterizedMessage("failed to connect to node [{}], ignoring...", listedNode), e);
+ logger.debug(() -> new ParameterizedMessage("failed to connect to node [{}], ignoring...", listedNode), e);
hostFailureListener.onNodeDisconnected(listedNode, e);
} catch (Exception e) {
- logger.info(
- (Supplier) () -> new ParameterizedMessage("failed to get node info for {}, disconnecting...", listedNode), e);
+ logger.info(() -> new ParameterizedMessage("failed to get node info for {}, disconnecting...", listedNode), e);
}
}
@@ -481,12 +478,10 @@ void onDone() {
public void onFailure(Exception e) {
onDone();
if (e instanceof ConnectTransportException) {
- logger.debug((Supplier)
- () -> new ParameterizedMessage("failed to connect to node [{}], ignoring...", nodeToPing), e);
+ logger.debug(() -> new ParameterizedMessage("failed to connect to node [{}], ignoring...", nodeToPing), e);
hostFailureListener.onNodeDisconnected(nodeToPing, e);
} else {
- logger.info(
- (Supplier) () -> new ParameterizedMessage(
+ logger.info(() -> new ParameterizedMessage(
"failed to get local cluster state info for {}, disconnecting...", nodeToPing), e);
}
}
@@ -530,8 +525,7 @@ public void handleResponse(ClusterStateResponse response) {
@Override
public void handleException(TransportException e) {
- logger.info(
- (Supplier) () -> new ParameterizedMessage(
+ logger.info(() -> new ParameterizedMessage(
"failed to get local cluster state for {}, disconnecting...", nodeToPing), e);
try {
hostFailureListener.onNodeDisconnected(nodeToPing, e);
diff --git a/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java b/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java
index aab75eb2aad7b..998cd5ba0a870 100644
--- a/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/NodeConnectionsService.java
@@ -19,7 +19,6 @@
package org.elasticsearch.cluster;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.component.AbstractLifecycleComponent;
@@ -98,7 +97,7 @@ public void onFailure(Exception e) {
// will try again after `cluster.nodes.reconnect_interval` on all nodes but the current master.
// On the master, node fault detection will remove these nodes from the cluster as their are not
// connected. Note that it is very rare that we end up here on the master.
- logger.warn((Supplier) () -> new ParameterizedMessage("failed to connect to {}", node), e);
+ logger.warn(() -> new ParameterizedMessage("failed to connect to {}", node), e);
}
@Override
@@ -137,7 +136,7 @@ public void disconnectFromNodesExcept(DiscoveryNodes nodesToKeep) {
try {
transportService.disconnectFromNode(node);
} catch (Exception e) {
- logger.warn((Supplier) () -> new ParameterizedMessage("failed to disconnect to node [{}]", node), e);
+ logger.warn(() -> new ParameterizedMessage("failed to disconnect to node [{}]", node), e);
}
}
}
@@ -160,9 +159,7 @@ void validateAndConnectIfNeeded(DiscoveryNode node) {
// log every 6th failure
if ((nodeFailureCount % 6) == 1) {
final int finalNodeFailureCount = nodeFailureCount;
- logger.warn(
- (Supplier)
- () -> new ParameterizedMessage(
+ logger.warn(() -> new ParameterizedMessage(
"failed to connect to node {} (tried [{}] times)", node, finalNodeFailureCount), e);
}
nodes.put(node, nodeFailureCount);
diff --git a/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java
index f29841e3744a9..915e900b9ddf1 100644
--- a/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java
+++ b/server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ExceptionsHelper;
import org.elasticsearch.Version;
@@ -205,7 +204,7 @@ private static class ShardFailedTransportHandler implements TransportRequestHand
@Override
public void messageReceived(FailedShardEntry request, TransportChannel channel) throws Exception {
- logger.debug((Supplier) () -> new ParameterizedMessage("{} received shard failed for {}", request.shardId, request), request.failure);
+ logger.debug(() -> new ParameterizedMessage("{} received shard failed for {}", request.shardId, request), request.failure);
clusterService.submitStateUpdateTask(
"shard-failed",
request,
@@ -214,12 +213,12 @@ public void messageReceived(FailedShardEntry request, TransportChannel channel)
new ClusterStateTaskListener() {
@Override
public void onFailure(String source, Exception e) {
- logger.error((Supplier) () -> new ParameterizedMessage("{} unexpected failure while failing shard [{}]", request.shardId, request), e);
+ logger.error(() -> new ParameterizedMessage("{} unexpected failure while failing shard [{}]", request.shardId, request), e);
try {
channel.sendResponse(e);
} catch (Exception channelException) {
channelException.addSuppressed(e);
- logger.warn((Supplier) () -> new ParameterizedMessage("{} failed to send failure [{}] while failing shard [{}]", request.shardId, e, request), channelException);
+ logger.warn(() -> new ParameterizedMessage("{} failed to send failure [{}] while failing shard [{}]", request.shardId, e, request), channelException);
}
}
@@ -229,7 +228,7 @@ public void onNoLongerMaster(String source) {
try {
channel.sendResponse(new NotMasterException(source));
} catch (Exception channelException) {
- logger.warn((Supplier) () -> new ParameterizedMessage("{} failed to send no longer master while failing shard [{}]", request.shardId, request), channelException);
+ logger.warn(() -> new ParameterizedMessage("{} failed to send no longer master while failing shard [{}]", request.shardId, request), channelException);
}
}
@@ -238,7 +237,7 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
try {
channel.sendResponse(TransportResponse.Empty.INSTANCE);
} catch (Exception channelException) {
- logger.warn((Supplier) () -> new ParameterizedMessage("{} failed to send response while failing shard [{}]", request.shardId, request), channelException);
+ logger.warn(() -> new ParameterizedMessage("{} failed to send response while failing shard [{}]", request.shardId, request), channelException);
}
}
}
@@ -323,7 +322,7 @@ public ClusterTasksResult execute(ClusterState currentState, L
maybeUpdatedState = applyFailedShards(currentState, failedShardsToBeApplied, staleShardsToBeApplied);
batchResultBuilder.successes(tasksToBeApplied);
} catch (Exception e) {
- logger.warn((Supplier) () -> new ParameterizedMessage("failed to apply failed shards {}", failedShardsToBeApplied), e);
+ logger.warn(() -> new ParameterizedMessage("failed to apply failed shards {}", failedShardsToBeApplied), e);
// failures are communicated back to the requester
// cluster state will not be updated in this case
batchResultBuilder.failures(tasksToBeApplied, e);
@@ -501,7 +500,7 @@ public ClusterTasksResult execute(ClusterState currentState,
maybeUpdatedState = allocationService.applyStartedShards(currentState, shardRoutingsToBeApplied);
builder.successes(tasksToBeApplied);
} catch (Exception e) {
- logger.warn((Supplier) () -> new ParameterizedMessage("failed to apply started shards {}", shardRoutingsToBeApplied), e);
+ logger.warn(() -> new ParameterizedMessage("failed to apply started shards {}", shardRoutingsToBeApplied), e);
builder.failures(tasksToBeApplied, e);
}
@@ -510,7 +509,7 @@ public ClusterTasksResult execute(ClusterState currentState,
@Override
public void onFailure(String source, Exception e) {
- logger.error((Supplier) () -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
+ logger.error(() -> new ParameterizedMessage("unexpected failure during [{}]", source), e);
}
}
diff --git a/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java
index 9e05d50831882..ee4779bc8c514 100644
--- a/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java
+++ b/server/src/main/java/org/elasticsearch/cluster/block/ClusterBlocks.java
@@ -20,6 +20,7 @@
package org.elasticsearch.cluster.block;
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
+
import org.elasticsearch.cluster.AbstractDiffable;
import org.elasticsearch.cluster.Diff;
import org.elasticsearch.cluster.metadata.IndexMetaData;
@@ -30,6 +31,7 @@
import org.elasticsearch.rest.RestStatus;
import java.io.IOException;
+import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -53,7 +55,7 @@ public class ClusterBlocks extends AbstractDiffable {
private final ImmutableOpenMap> indicesBlocks;
- private final ImmutableLevelHolder[] levelHolders;
+ private final EnumMap levelHolders;
ClusterBlocks(Set global, ImmutableOpenMap> indicesBlocks) {
this.global = global;
@@ -70,20 +72,20 @@ public ImmutableOpenMap> indices() {
}
public Set global(ClusterBlockLevel level) {
- return levelHolders[level.ordinal()].global();
+ return levelHolders.get(level).global();
}
public ImmutableOpenMap> indices(ClusterBlockLevel level) {
- return levelHolders[level.ordinal()].indices();
+ return levelHolders.get(level).indices();
}
private Set blocksForIndex(ClusterBlockLevel level, String index) {
return indices(level).getOrDefault(index, emptySet());
}
- private static ImmutableLevelHolder[] generateLevelHolders(Set global,
- ImmutableOpenMap> indicesBlocks) {
- ImmutableLevelHolder[] levelHolders = new ImmutableLevelHolder[ClusterBlockLevel.values().length];
+ private static EnumMap generateLevelHolders(Set global,
+ ImmutableOpenMap> indicesBlocks) {
+ EnumMap levelHolders = new EnumMap<>(ClusterBlockLevel.class);
for (final ClusterBlockLevel level : ClusterBlockLevel.values()) {
Predicate containsLevel = block -> block.contains(level);
Set newGlobal = unmodifiableSet(global.stream()
@@ -96,8 +98,7 @@ private static ImmutableLevelHolder[] generateLevelHolders(Set glo
.filter(containsLevel)
.collect(toSet())));
}
-
- levelHolders[level.ordinal()] = new ImmutableLevelHolder(newGlobal, indicesBuilder.build());
+ levelHolders.put(level, new ImmutableLevelHolder(newGlobal, indicesBuilder.build()));
}
return levelHolders;
}
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
index d394c2c7d1479..4f5dade2219df 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataCreateIndexService.java
@@ -23,7 +23,6 @@
import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.util.CollectionUtil;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ResourceAlreadyExistsException;
@@ -555,9 +554,9 @@ public ClusterState execute(ClusterState currentState) throws Exception {
@Override
public void onFailure(String source, Exception e) {
if (e instanceof ResourceAlreadyExistsException) {
- logger.trace((Supplier) () -> new ParameterizedMessage("[{}] failed to create", request.index()), e);
+ logger.trace(() -> new ParameterizedMessage("[{}] failed to create", request.index()), e);
} else {
- logger.debug((Supplier) () -> new ParameterizedMessage("[{}] failed to create", request.index()), e);
+ logger.debug(() -> new ParameterizedMessage("[{}] failed to create", request.index()), e);
}
super.onFailure(source, e);
}
@@ -695,9 +694,9 @@ static void prepareResizeIndexSettings(ClusterState currentState, Set ma
}
final Predicate sourceSettingsPredicate = (s) -> s.startsWith("index.similarity.")
- || s.startsWith("index.analysis.") || s.startsWith("index.sort.");
+ || s.startsWith("index.analysis.") || s.startsWith("index.sort.") || s.equals("index.mapping.single_type");
indexSettingsBuilder
- // now copy all similarity / analysis / sort settings - this overrides all settings from the user unless they
+ // now copy all similarity / analysis / sort / single_type settings - this overrides all settings from the user unless they
// wanna add extra settings
.put(IndexMetaData.SETTING_VERSION_CREATED, sourceMetaData.getCreationVersion())
.put(IndexMetaData.SETTING_VERSION_UPGRADED, sourceMetaData.getUpgradedVersion())
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
index ea1dea06b6875..7230c44906d77 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
@@ -19,7 +19,6 @@
package org.elasticsearch.cluster.metadata;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.apache.lucene.analysis.Analyzer;
import org.elasticsearch.Version;
import org.elasticsearch.common.component.AbstractComponent;
@@ -207,7 +206,7 @@ IndexMetaData archiveBrokenIndexSettings(IndexMetaData indexMetaData) {
final Settings upgrade = indexScopedSettings.archiveUnknownOrInvalidSettings(
settings,
e -> logger.warn("{} ignoring unknown index setting: [{}] with value [{}]; archiving", indexMetaData.getIndex(), e.getKey(), e.getValue()),
- (e, ex) -> logger.warn((Supplier) () -> new ParameterizedMessage("{} ignoring invalid index setting: [{}] with value [{}]; archiving", indexMetaData.getIndex(), e.getKey(), e.getValue()), ex));
+ (e, ex) -> logger.warn(() -> new ParameterizedMessage("{} ignoring invalid index setting: [{}] with value [{}]; archiving", indexMetaData.getIndex(), e.getKey(), e.getValue()), ex));
if (upgrade != settings) {
return IndexMetaData.builder(indexMetaData).settings(upgrade).build();
} else {
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
index 2255081522891..16695488d2626 100644
--- a/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/metadata/MetaDataMappingService.java
@@ -191,7 +191,7 @@ private boolean refreshIndexMapping(IndexService indexService, IndexMetaData.Bui
}
}
} catch (Exception e) {
- logger.warn((Supplier) () -> new ParameterizedMessage("[{}] failed to refresh-mapping in cluster state", index), e);
+ logger.warn(() -> new ParameterizedMessage("[{}] failed to refresh-mapping in cluster state", index), e);
}
return dirty;
}
@@ -205,7 +205,7 @@ public void refreshMapping(final String index, final String indexUUID) {
refreshTask,
ClusterStateTaskConfig.build(Priority.HIGH),
refreshExecutor,
- (source, e) -> logger.warn((Supplier) () -> new ParameterizedMessage("failure during [{}]", source), e)
+ (source, e) -> logger.warn(() -> new ParameterizedMessage("failure during [{}]", source), e)
);
}
diff --git a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
index 1c3d629a72fea..0bcefa9fc7248 100644
--- a/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/routing/RoutingService.java
@@ -20,7 +20,6 @@
package org.elasticsearch.cluster.routing;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.cluster.ClusterChangedEvent;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.ClusterStateUpdateTask;
@@ -109,16 +108,16 @@ public void onFailure(String source, Exception e) {
rerouting.set(false);
ClusterState state = clusterService.state();
if (logger.isTraceEnabled()) {
- logger.error((Supplier) () -> new ParameterizedMessage("unexpected failure during [{}], current state:\n{}", source, state), e);
+ logger.error(() -> new ParameterizedMessage("unexpected failure during [{}], current state:\n{}", source, state), e);
} else {
- logger.error((Supplier) () -> new ParameterizedMessage("unexpected failure during [{}], current state version [{}]", source, state.version()), e);
+ logger.error(() -> new ParameterizedMessage("unexpected failure during [{}], current state version [{}]", source, state.version()), e);
}
}
});
} catch (Exception e) {
rerouting.set(false);
ClusterState state = clusterService.state();
- logger.warn((Supplier) () -> new ParameterizedMessage("failed to reroute routing table, current state:\n{}", state), e);
+ logger.warn(() -> new ParameterizedMessage("failed to reroute routing table, current state:\n{}", state), e);
}
}
}
diff --git a/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java
index ae79b779045f4..01fa5837387c8 100644
--- a/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/service/ClusterApplierService.java
@@ -316,7 +316,7 @@ public void runOnApplierThread(final String source, Consumer clust
}
@Override
- public void onNewClusterState(final String source, final java.util.function.Supplier clusterStateSupplier,
+ public void onNewClusterState(final String source, final Supplier clusterStateSupplier,
final ClusterStateTaskListener listener) {
Function applyFunction = currentState -> {
ClusterState nextState = clusterStateSupplier.get();
@@ -401,7 +401,7 @@ protected void runTask(UpdateTask task) {
} catch (Exception e) {
TimeValue executionTime = TimeValue.timeValueMillis(Math.max(0, TimeValue.nsecToMSec(currentTimeInNanos() - startTimeNS)));
if (logger.isTraceEnabled()) {
- logger.trace(new ParameterizedMessage(
+ logger.trace(() -> new ParameterizedMessage(
"failed to execute cluster state applier in [{}], state:\nversion [{}], source [{}]\n{}{}{}",
executionTime,
previousClusterState.version(),
@@ -439,8 +439,7 @@ protected void runTask(UpdateTask task) {
final long version = newClusterState.version();
final String stateUUID = newClusterState.stateUUID();
final String fullState = newClusterState.toString();
- logger.warn(
- (org.apache.logging.log4j.util.Supplier) () -> new ParameterizedMessage(
+ logger.warn(() -> new ParameterizedMessage(
"failed to apply updated cluster state in [{}]:\nversion [{}], uuid [{}], source [{}]\n{}",
executionTime,
version,
diff --git a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
index 6858866d2dc88..20a6602b5c5ad 100644
--- a/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
+++ b/server/src/main/java/org/elasticsearch/cluster/service/MasterService.java
@@ -21,7 +21,6 @@
import org.apache.logging.log4j.Logger;
import org.apache.logging.log4j.message.ParameterizedMessage;
-import org.apache.logging.log4j.util.Supplier;
import org.elasticsearch.Assertions;
import org.elasticsearch.cluster.AckedClusterStateTaskListener;
import org.elasticsearch.cluster.ClusterChangedEvent;
@@ -226,10 +225,8 @@ protected void runTasks(TaskInputs taskInputs) {
clusterStatePublisher.accept(clusterChangedEvent, taskOutputs.createAckListener(threadPool, newClusterState));
} catch (Discovery.FailedToCommitClusterStateException t) {
final long version = newClusterState.version();
- logger.warn(
- (Supplier) () -> new ParameterizedMessage(
- "failing [{}]: failed to commit cluster state version [{}]", summary, version),
- t);
+ logger.warn(() -> new ParameterizedMessage(
+ "failing [{}]: failed to commit cluster state version [{}]", summary, version), t);
taskOutputs.publishingFailed(t);
return;
}
@@ -239,11 +236,9 @@ protected void runTasks(TaskInputs taskInputs) {
try {
taskOutputs.clusterStatePublished(clusterChangedEvent);
} catch (Exception e) {
- logger.error(
- (Supplier) () -> new ParameterizedMessage(
+ logger.error(() -> new ParameterizedMessage(
"exception thrown while notifying executor of new cluster state publication [{}]",
- summary),
- e);
+ summary), e);
}
TimeValue executionTime = TimeValue.timeValueMillis(Math.max(0, TimeValue.nsecToMSec(currentTimeInNanos() - startTimeNS)));
logger.debug("processing [{}]: took [{}] done publishing updated cluster state (version: {}, uuid: {})", summary,
@@ -255,8 +250,7 @@ protected void runTasks(TaskInputs taskInputs) {
final long version = newClusterState.version();
final String stateUUID = newClusterState.stateUUID();
final String fullState = newClusterState.toString();
- logger.warn(
- (Supplier) () -> new ParameterizedMessage(
+ logger.warn(() -> new ParameterizedMessage(
"failed to publish updated cluster state in [{}]:\nversion [{}], uuid [{}], source [{}]\n{}",
executionTime,
version,
@@ -473,8 +467,7 @@ public void onFailure(String source, Exception e) {
listener.onFailure(source, e);
} catch (Exception inner) {
inner.addSuppressed(e);
- logger.error(
- (Supplier) () -> new ParameterizedMessage(
+ logger.error(() -> new ParameterizedMessage(
"exception thrown by listener notifying of failure from [{}]", source), inner);
}
}
@@ -484,8 +477,7 @@ public void onNoLongerMaster(String source) {
try {
listener.onNoLongerMaster(source);
} catch (Exception e) {
- logger.error(
- (Supplier) () -> new ParameterizedMessage(
+ logger.error(() -> new ParameterizedMessage(
"exception thrown by listener while notifying no longer master from [{}]", source), e);
}
}
@@ -495,12 +487,9 @@ public void clusterStateProcessed(String source, ClusterState oldState, ClusterS
try {
listener.clusterStateProcessed(source, oldState, newState);
} catch (Exception e) {
- logger.error(
- (Supplier) () -> new ParameterizedMessage(
+ logger.error(() -> new ParameterizedMessage(
"exception thrown by listener while notifying of cluster state processed from [{}], old cluster state:\n" +
- "{}\nnew cluster state:\n{}",
- source, oldState, newState),
- e);
+ "{}\nnew cluster state:\n{}", source, oldState, newState), e);
}
}
}
@@ -614,10 +603,8 @@ public void onNodeAck(DiscoveryNode node, @Nullable Exception e) {
logger.trace("ack received from node [{}], cluster_state update (version: {})", node, clusterStateVersion);
} else {
this.lastFailure = e;
- logger.debug(
- (Supplier) () -> new ParameterizedMessage(
- "ack received from node [{}], cluster_state update (version: {})", node, clusterStateVersion),
- e);
+ logger.debug(() -> new ParameterizedMessage(
+ "ack received from node [{}], cluster_state update (version: {})", node, clusterStateVersion), e);
}
if (countDown.countDown()) {
@@ -650,7 +637,7 @@ protected ClusterTasksResult