getAllStatusCodes() {
+ return ALL_STATUS_CODES;
+ }
+}
diff --git a/core/README.textile b/core/README.textile
deleted file mode 100644
index daaf5ecb70e..00000000000
--- a/core/README.textile
+++ /dev/null
@@ -1,235 +0,0 @@
-h1. Elasticsearch
-
-h2. A Distributed RESTful Search Engine
-
-h3. "https://www.elastic.co/products/elasticsearch":https://www.elastic.co/products/elasticsearch
-
-Elasticsearch is a distributed RESTful search engine built for the cloud. Features include:
-
-* Distributed and Highly Available Search Engine.
-** Each index is fully sharded with a configurable number of shards.
-** Each shard can have one or more replicas.
-** Read / Search operations performed on either one of the replica shard.
-* Multi Tenant with Multi Types.
-** Support for more than one index.
-** Support for more than one type per index.
-** Index level configuration (number of shards, index storage, ...).
-* Various set of APIs
-** HTTP RESTful API
-** Native Java API.
-** All APIs perform automatic node operation rerouting.
-* Document oriented
-** No need for upfront schema definition.
-** Schema can be defined per type for customization of the indexing process.
-* Reliable, Asynchronous Write Behind for long term persistency.
-* (Near) Real Time Search.
-* Built on top of Lucene
-** Each shard is a fully functional Lucene index
-** 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
-
-First of all, DON'T PANIC. It will take 5 minutes to get the gist of what Elasticsearch is all about.
-
-h3. Requirements
-
-You need to have a recent version of Java installed. See the "Setup":http://www.elastic.co/guide/en/elasticsearch/reference/current/setup.html#jvm-version page for more information.
-
-h3. Installation
-
-* "Download":https://www.elastic.co/downloads/elasticsearch and unzip the Elasticsearch official distribution.
-* Run @bin/elasticsearch@ on unix, or @bin\elasticsearch.bat@ on windows.
-* Run @curl -X GET http://localhost:9200/@.
-* Start more servers ...
-
-h3. Indexing
-
-Let's try and index some twitter like information. First, let's create a twitter user, and add some tweets (the @twitter@ index will be created automatically):
-
-
-curl -XPUT 'http://localhost:9200/twitter/user/kimchy' -d '{ "name" : "Shay Banon" }'
-
-curl -XPUT 'http://localhost:9200/twitter/tweet/1' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T13:12:00",
- "message": "Trying out Elasticsearch, so far so good?"
-}'
-
-curl -XPUT 'http://localhost:9200/twitter/tweet/2' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T14:12:12",
- "message": "Another tweet, will it be indexed?"
-}'
-
-
-Now, let's see if the information was added by GETting it:
-
-
-curl -XGET 'http://localhost:9200/twitter/user/kimchy?pretty=true'
-curl -XGET 'http://localhost:9200/twitter/tweet/1?pretty=true'
-curl -XGET 'http://localhost:9200/twitter/tweet/2?pretty=true'
-
-
-h3. Searching
-
-Mmm search..., shouldn't it be elastic?
-Let's find all the tweets that @kimchy@ posted:
-
-
-curl -XGET 'http://localhost:9200/twitter/tweet/_search?q=user:kimchy&pretty=true'
-
-
-We can also use the JSON query language Elasticsearch provides instead of a query string:
-
-
-curl -XGET 'http://localhost:9200/twitter/tweet/_search?pretty=true' -d '
-{
- "query" : {
- "match" : { "user": "kimchy" }
- }
-}'
-
-
-Just for kicks, let's get all the documents stored (we should see the user as well):
-
-
-curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -d '
-{
- "query" : {
- "matchAll" : {}
- }
-}'
-
-
-We can also do range search (the @postDate@ was automatically identified as date)
-
-
-curl -XGET 'http://localhost:9200/twitter/_search?pretty=true' -d '
-{
- "query" : {
- "range" : {
- "postDate" : { "from" : "2009-11-15T13:00:00", "to" : "2009-11-15T14:00:00" }
- }
- }
-}'
-
-
-There are many more options to perform search, after all, it's a search product no? All the familiar Lucene queries are available through the JSON query language, or through the query parser.
-
-h3. Multi Tenant - Indices and Types
-
-Maan, that twitter index might get big (in this case, index size == valuation). Let's see if we can structure our twitter system a bit differently in order to support such large amounts of data.
-
-Elasticsearch supports multiple indices, as well as multiple types per index. In the previous example we used an index called @twitter@, with two types, @user@ and @tweet@.
-
-Another way to define our simple twitter system is to have a different index per user (note, though that each index has an overhead). Here is the indexing curl's in this case:
-
-
-curl -XPUT 'http://localhost:9200/kimchy/info/1' -d '{ "name" : "Shay Banon" }'
-
-curl -XPUT 'http://localhost:9200/kimchy/tweet/1' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T13:12:00",
- "message": "Trying out Elasticsearch, so far so good?"
-}'
-
-curl -XPUT 'http://localhost:9200/kimchy/tweet/2' -d '
-{
- "user": "kimchy",
- "postDate": "2009-11-15T14:12:12",
- "message": "Another tweet, will it be indexed?"
-}'
-
-
-The above will index information into the @kimchy@ index, with two types, @info@ and @tweet@. Each user will get his own special index.
-
-Complete control on the index level is allowed. As an example, in the above case, we would want to change from the default 5 shards with 1 replica per index, to only 1 shard with 1 replica per index (== per twitter user). Here is how this can be done (the configuration can be in yaml as well):
-
-
-curl -XPUT http://localhost:9200/another_user/ -d '
-{
- "index" : {
- "numberOfShards" : 1,
- "numberOfReplicas" : 1
- }
-}'
-
-
-Search (and similar operations) are multi index aware. This means that we can easily search on more than one
-index (twitter user), for example:
-
-
-curl -XGET 'http://localhost:9200/kimchy,another_user/_search?pretty=true' -d '
-{
- "query" : {
- "matchAll" : {}
- }
-}'
-
-
-Or on all the indices:
-
-
-curl -XGET 'http://localhost:9200/_search?pretty=true' -d '
-{
- "query" : {
- "matchAll" : {}
- }
-}'
-
-
-{One liner teaser}: And the cool part about that? You can easily search on multiple twitter users (indices), with different boost levels per user (index), making social search so much simpler (results from my friends rank higher than results from friends of my friends).
-
-h3. Distributed, Highly Available
-
-Let's face it, things will fail....
-
-Elasticsearch is a highly available and distributed search engine. Each index is broken down into shards, and each shard can have one or more replica. By default, an index is created with 5 shards and 1 replica per shard (5/1). There are many topologies that can be used, including 1/10 (improve search performance), or 20/1 (improve indexing performance, with search executed in a map reduce fashion across shards).
-
-In order to play with the distributed nature of Elasticsearch, simply bring more nodes up and shut down nodes. The system will continue to serve requests (make sure you use the correct http port) with the latest data indexed.
-
-h3. Where to go from here?
-
-We have just covered a very small portion of what Elasticsearch is all about. For more information, please refer to the "elastic.co":http://www.elastic.co/products/elasticsearch website.
-
-h3. Building from Source
-
-Elasticsearch uses "Maven":http://maven.apache.org for its build system.
-
-In order to create a distribution, simply run the @mvn clean package
--DskipTests@ command in the cloned directory.
-
-The distribution will be created under @target/releases@.
-
-See the "TESTING":TESTING.asciidoc file for more information about
-running the Elasticsearch test suite.
-
-h3. Upgrading to Elasticsearch 1.x?
-
-In order to ensure a smooth upgrade process from earlier versions of Elasticsearch (< 1.0.0), it is recommended 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/core/build.gradle b/core/build.gradle
index ab3754e72ff..6fd8c62af3e 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -24,6 +24,16 @@ import org.elasticsearch.gradle.BuildPlugin
apply plugin: 'elasticsearch.build'
apply plugin: 'com.bmuschko.nexus'
apply plugin: 'nebula.optional-base'
+apply plugin: 'nebula.maven-base-publish'
+apply plugin: 'nebula.maven-scm'
+
+publishing {
+ publications {
+ nebula {
+ artifactId 'elasticsearch'
+ }
+ }
+}
archivesBaseName = 'elasticsearch'
@@ -46,14 +56,14 @@ dependencies {
compile "org.apache.lucene:lucene-spatial3d:${versions.lucene}"
compile "org.apache.lucene:lucene-suggest:${versions.lucene}"
- compile 'org.elasticsearch:securesm:1.0'
+ compile 'org.elasticsearch:securesm:1.1'
// utilities
- compile 'net.sf.jopt-simple:jopt-simple:4.9'
+ compile 'net.sf.jopt-simple:jopt-simple:5.0.2'
compile 'com.carrotsearch:hppc:0.7.1'
// time handling, remove with java 8 time
- compile 'joda-time:joda-time:2.8.2'
+ compile 'joda-time:joda-time:2.9.4'
// joda 2.0 moved to using volatile fields for datetime
// When updating to a new version, make sure to update our copy of BaseDateTime
compile 'org.joda:joda-convert:1.2'
@@ -65,7 +75,7 @@ dependencies {
compile "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
// network stack
- compile 'io.netty:netty:3.10.5.Final'
+ compile 'io.netty:netty:3.10.6.Final'
// percentiles aggregation
compile 'com.tdunning:t-digest:3.0'
// precentil ranks aggregation
@@ -79,7 +89,7 @@ dependencies {
compile "log4j:log4j:${versions.log4j}", optional
compile "log4j:apache-log4j-extras:${versions.log4j}", optional
- compile "net.java.dev.jna:jna:${versions.jna}", optional
+ compile "net.java.dev.jna:jna:${versions.jna}"
if (isEclipse == false || project.path == ":core-tests") {
testCompile("org.elasticsearch.test:framework:${version}") {
@@ -111,6 +121,36 @@ forbiddenPatterns {
exclude '**/org/elasticsearch/cluster/routing/shard_routes.txt'
}
+task generateModulesList {
+ List modules = project(':modules').subprojects.collect { it.name }
+ File modulesFile = new File(buildDir, 'generated-resources/modules.txt')
+ processResources.from(modulesFile)
+ inputs.property('modules', modules)
+ outputs.file(modulesFile)
+ doLast {
+ modulesFile.parentFile.mkdirs()
+ modulesFile.setText(modules.join('\n'), 'UTF-8')
+ }
+}
+
+task generatePluginsList {
+ List plugins = project(':plugins').subprojects
+ .findAll { it.name.contains('example') == false }
+ .collect { it.name }
+ File pluginsFile = new File(buildDir, 'generated-resources/plugins.txt')
+ processResources.from(pluginsFile)
+ inputs.property('plugins', plugins)
+ outputs.file(pluginsFile)
+ doLast {
+ pluginsFile.parentFile.mkdirs()
+ pluginsFile.setText(plugins.join('\n'), 'UTF-8')
+ }
+}
+
+processResources {
+ dependsOn generateModulesList, generatePluginsList
+}
+
thirdPartyAudit.excludes = [
// uses internal java api: sun.security.x509 (X509CertInfo, X509CertImpl, X500Name)
'org.jboss.netty.handler.ssl.util.OpenJdkSelfSignedCertGenerator',
diff --git a/core/src/main/java/org/elasticsearch/search/query/QueryParseElement.java b/core/src/main/java/org/apache/log4j/Java9Hack.java
similarity index 63%
rename from core/src/main/java/org/elasticsearch/search/query/QueryParseElement.java
rename to core/src/main/java/org/apache/log4j/Java9Hack.java
index 094a29cd6b1..831cf5b35ae 100644
--- a/core/src/main/java/org/elasticsearch/search/query/QueryParseElement.java
+++ b/core/src/main/java/org/apache/log4j/Java9Hack.java
@@ -17,19 +17,21 @@
* under the License.
*/
-package org.elasticsearch.search.query;
+package org.apache.log4j;
-import org.elasticsearch.common.xcontent.XContentParser;
-import org.elasticsearch.search.SearchParseElement;
-import org.elasticsearch.search.internal.SearchContext;
+import org.apache.log4j.helpers.ThreadLocalMap;
/**
+ * Log4j 1.2 MDC breaks because it parses java.version incorrectly (does not handle new java9 versioning).
*
+ * This hack fixes up the pkg private members as if it had detected the java version correctly.
*/
-public class QueryParseElement implements SearchParseElement {
+public class Java9Hack {
- @Override
- public void parse(XContentParser parser, SearchContext context) throws Exception {
- context.parsedQuery(context.getQueryShardContext().parse(parser));
+ public static void fixLog4j() {
+ if (MDC.mdc.tlm == null) {
+ MDC.mdc.java1 = false;
+ MDC.mdc.tlm = new ThreadLocalMap();
+ }
}
}
diff --git a/core/src/main/java/org/apache/lucene/document/XInetAddressPoint.java b/core/src/main/java/org/apache/lucene/document/XInetAddressPoint.java
deleted file mode 100644
index 580b875ce2c..00000000000
--- a/core/src/main/java/org/apache/lucene/document/XInetAddressPoint.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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.
- */
-package org.apache.lucene.document;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-
-import org.apache.lucene.search.Query;
-import org.apache.lucene.util.NumericUtils;
-import org.elasticsearch.common.SuppressForbidden;
-
-/**
- * Forked utility methods from Lucene's InetAddressPoint until LUCENE-7232 and
- * LUCENE-7234 are released.
- */
-// TODO: remove me when we upgrade to Lucene 6.1
-@SuppressForbidden(reason="uses InetAddress.getHostAddress")
-public final class XInetAddressPoint {
-
- private XInetAddressPoint() {}
-
- /** The minimum value that an ip address can hold. */
- public static final InetAddress MIN_VALUE;
- /** The maximum value that an ip address can hold. */
- public static final InetAddress MAX_VALUE;
- static {
- MIN_VALUE = InetAddressPoint.decode(new byte[InetAddressPoint.BYTES]);
- byte[] maxValueBytes = new byte[InetAddressPoint.BYTES];
- Arrays.fill(maxValueBytes, (byte) 0xFF);
- MAX_VALUE = InetAddressPoint.decode(maxValueBytes);
- }
-
- /**
- * Return the {@link InetAddress} that compares immediately greater than
- * {@code address}.
- * @throws ArithmeticException if the provided address is the
- * {@link #MAX_VALUE maximum ip address}
- */
- public static InetAddress nextUp(InetAddress address) {
- if (address.equals(MAX_VALUE)) {
- throw new ArithmeticException("Overflow: there is no greater InetAddress than "
- + address.getHostAddress());
- }
- byte[] delta = new byte[InetAddressPoint.BYTES];
- delta[InetAddressPoint.BYTES-1] = 1;
- byte[] nextUpBytes = new byte[InetAddressPoint.BYTES];
- NumericUtils.add(InetAddressPoint.BYTES, 0, InetAddressPoint.encode(address), delta, nextUpBytes);
- return InetAddressPoint.decode(nextUpBytes);
- }
-
- /**
- * Return the {@link InetAddress} that compares immediately less than
- * {@code address}.
- * @throws ArithmeticException if the provided address is the
- * {@link #MIN_VALUE minimum ip address}
- */
- public static InetAddress nextDown(InetAddress address) {
- if (address.equals(MIN_VALUE)) {
- throw new ArithmeticException("Underflow: there is no smaller InetAddress than "
- + address.getHostAddress());
- }
- byte[] delta = new byte[InetAddressPoint.BYTES];
- delta[InetAddressPoint.BYTES-1] = 1;
- byte[] nextDownBytes = new byte[InetAddressPoint.BYTES];
- NumericUtils.subtract(InetAddressPoint.BYTES, 0, InetAddressPoint.encode(address), delta, nextDownBytes);
- return InetAddressPoint.decode(nextDownBytes);
- }
-
- /**
- * Create a prefix query for matching a CIDR network range.
- *
- * @param field field name. must not be {@code null}.
- * @param value any host address
- * @param prefixLength the network prefix length for this address. This is also known as the subnet mask in the context of IPv4
- * addresses.
- * @throws IllegalArgumentException if {@code field} is null, or prefixLength is invalid.
- * @return a query matching documents with addresses contained within this network
- */
- // TODO: remove me when we upgrade to Lucene 6.0.1
- public static Query newPrefixQuery(String field, InetAddress value, int prefixLength) {
- if (value == null) {
- throw new IllegalArgumentException("InetAddress must not be null");
- }
- if (prefixLength < 0 || prefixLength > 8 * value.getAddress().length) {
- throw new IllegalArgumentException("illegal prefixLength '" + prefixLength
- + "'. Must be 0-32 for IPv4 ranges, 0-128 for IPv6 ranges");
- }
- // create the lower value by zeroing out the host portion, upper value by filling it with all ones.
- byte lower[] = value.getAddress();
- byte upper[] = value.getAddress();
- for (int i = prefixLength; i < 8 * lower.length; i++) {
- int m = 1 << (7 - (i & 7));
- lower[i >> 3] &= ~m;
- upper[i >> 3] |= m;
- }
- try {
- return InetAddressPoint.newRangeQuery(field, InetAddress.getByAddress(lower), InetAddress.getByAddress(upper));
- } catch (UnknownHostException e) {
- throw new AssertionError(e); // values are coming from InetAddress
- }
- }
-}
diff --git a/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java b/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
index 564f780b8ed..a4b94b007fd 100644
--- a/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
+++ b/core/src/main/java/org/apache/lucene/queries/BlendedTermQuery.java
@@ -283,7 +283,7 @@ public abstract class BlendedTermQuery extends Query {
@Override
public boolean equals(Object o) {
if (this == o) return true;
- if (!super.equals(o)) return false;
+ if (sameClassAs(o) == false) return false;
BlendedTermQuery that = (BlendedTermQuery) o;
return Arrays.equals(equalsTerms(), that.equalsTerms());
@@ -291,7 +291,7 @@ public abstract class BlendedTermQuery extends Query {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), Arrays.hashCode(equalsTerms()));
+ return Objects.hash(classHash(), Arrays.hashCode(equalsTerms()));
}
public static BlendedTermQuery booleanBlendedQuery(Term[] terms, final boolean disableCoord) {
diff --git a/core/src/main/java/org/apache/lucene/queries/MinDocQuery.java b/core/src/main/java/org/apache/lucene/queries/MinDocQuery.java
index 86982bfc949..a8b7dc9299f 100644
--- a/core/src/main/java/org/apache/lucene/queries/MinDocQuery.java
+++ b/core/src/main/java/org/apache/lucene/queries/MinDocQuery.java
@@ -44,12 +44,12 @@ public final class MinDocQuery extends Query {
@Override
public int hashCode() {
- return Objects.hash(super.hashCode(), minDoc);
+ return Objects.hash(classHash(), minDoc);
}
@Override
public boolean equals(Object obj) {
- if (super.equals(obj) == false) {
+ if (sameClassAs(obj) == false) {
return false;
}
MinDocQuery that = (MinDocQuery) obj;
diff --git a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
index a9327d785e1..c65f962dbb8 100644
--- a/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
+++ b/core/src/main/java/org/apache/lucene/search/suggest/analyzing/XAnalyzingSuggester.java
@@ -63,9 +63,6 @@ import org.elasticsearch.common.io.PathUtils;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -622,8 +619,12 @@ public long ramBytesUsed() {
Set seenSurfaceForms = new HashSet<>();
int dedup = 0;
- while (reader.read(scratch)) {
- input.reset(scratch.bytes(), 0, scratch.length());
+ while (true) {
+ BytesRef bytes = reader.next();
+ if (bytes == null) {
+ break;
+ }
+ input.reset(bytes.bytes, bytes.offset, bytes.length);
short analyzedLength = input.readShort();
analyzed.grow(analyzedLength+2);
input.readBytes(analyzed.bytes(), 0, analyzedLength);
@@ -631,13 +632,13 @@ public long ramBytesUsed() {
long cost = input.readInt();
- surface.bytes = scratch.bytes();
+ surface.bytes = bytes.bytes;
if (hasPayloads) {
surface.length = input.readShort();
surface.offset = input.getPosition();
} else {
surface.offset = input.getPosition();
- surface.length = scratch.length() - surface.offset;
+ surface.length = bytes.length - surface.offset;
}
if (previousAnalyzed == null) {
@@ -679,11 +680,11 @@ public long ramBytesUsed() {
builder.add(scratchInts.get(), outputs.newPair(cost, BytesRef.deepCopyOf(surface)));
} else {
int payloadOffset = input.getPosition() + surface.length;
- int payloadLength = scratch.length() - payloadOffset;
+ int payloadLength = bytes.length - payloadOffset;
BytesRef br = new BytesRef(surface.length + 1 + payloadLength);
System.arraycopy(surface.bytes, surface.offset, br.bytes, 0, surface.length);
br.bytes[surface.length] = (byte) payloadSep;
- System.arraycopy(scratch.bytes(), payloadOffset, br.bytes, surface.length+1, payloadLength);
+ System.arraycopy(bytes.bytes, payloadOffset, br.bytes, surface.length+1, payloadLength);
br.length = br.bytes.length;
builder.add(scratchInts.get(), outputs.newPair(cost, br));
}
@@ -1109,7 +1110,7 @@ public long ramBytesUsed() {
this.analyzed.copyBytes(analyzed);
}
- private final static class SurfaceFormAndPayload implements Comparable {
+ private static final class SurfaceFormAndPayload implements Comparable {
BytesRef payload;
long weight;
diff --git a/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java b/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java
index ea504f7688c..e1ae7b938b3 100644
--- a/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java
+++ b/core/src/main/java/org/apache/lucene/store/StoreRateLimiting.java
@@ -26,7 +26,7 @@ import org.elasticsearch.common.unit.ByteSizeValue;
*/
public class StoreRateLimiting {
- public static interface Provider {
+ public interface Provider {
StoreRateLimiting rateLimiting();
}
diff --git a/core/src/main/java/org/elasticsearch/Build.java b/core/src/main/java/org/elasticsearch/Build.java
index f844e3b4040..25da5f28166 100644
--- a/core/src/main/java/org/elasticsearch/Build.java
+++ b/core/src/main/java/org/elasticsearch/Build.java
@@ -19,16 +19,11 @@
package org.elasticsearch;
-import org.elasticsearch.common.SuppressForbidden;
-import org.elasticsearch.common.io.PathUtils;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import java.io.IOException;
-import java.net.URISyntaxException;
import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Path;
import java.util.jar.JarInputStream;
import java.util.jar.Manifest;
@@ -47,9 +42,9 @@ public class Build {
final String date;
final boolean isSnapshot;
- Path path = getElasticsearchCodebase();
- if (path.toString().endsWith(".jar")) {
- try (JarInputStream jar = new JarInputStream(Files.newInputStream(path))) {
+ final URL url = getElasticsearchCodebase();
+ if (url.toString().endsWith(".jar")) {
+ try (JarInputStream jar = new JarInputStream(url.openStream())) {
Manifest manifest = jar.getManifest();
shortHash = manifest.getMainAttributes().getValue("Change");
date = manifest.getMainAttributes().getValue("Build-Date");
@@ -80,14 +75,8 @@ public class Build {
/**
* Returns path to elasticsearch codebase path
*/
- @SuppressForbidden(reason = "looks up path of elasticsearch.jar directly")
- static Path getElasticsearchCodebase() {
- URL url = Build.class.getProtectionDomain().getCodeSource().getLocation();
- try {
- return PathUtils.get(url.toURI());
- } catch (URISyntaxException bogus) {
- throw new RuntimeException(bogus);
- }
+ static URL getElasticsearchCodebase() {
+ return Build.class.getProtectionDomain().getCodeSource().getLocation();
}
private String shortHash;
diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchException.java b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
index 3332bfed0c3..54bbfc851d2 100644
--- a/core/src/main/java/org/elasticsearch/ElasticsearchException.java
+++ b/core/src/main/java/org/elasticsearch/ElasticsearchException.java
@@ -21,18 +21,18 @@ package org.elasticsearch;
import org.elasticsearch.action.support.replication.ReplicationOperation;
import org.elasticsearch.cluster.action.shard.ShardStateAction;
-import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.logging.LoggerMessageFormat;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.index.Index;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.transport.TcpTransport;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
@@ -47,7 +47,7 @@ import static org.elasticsearch.cluster.metadata.IndexMetaData.INDEX_UUID_NA_VAL
/**
* A base class for all elasticsearch exceptions.
*/
-public class ElasticsearchException extends RuntimeException implements ToXContent {
+public class ElasticsearchException extends RuntimeException implements ToXContent, Writeable {
public static final String REST_EXCEPTION_SKIP_CAUSE = "rest.exception.cause.skip";
public static final String REST_EXCEPTION_SKIP_STACK_TRACE = "rest.exception.stacktrace.skip";
@@ -99,18 +99,9 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
}
public ElasticsearchException(StreamInput in) throws IOException {
- super(in.readOptionalString(), in.readThrowable());
+ super(in.readOptionalString(), in.readException());
readStackTrace(this, in);
- int numKeys = in.readVInt();
- for (int i = 0; i < numKeys; i++) {
- final String key = in.readString();
- final int numValues = in.readVInt();
- final ArrayList values = new ArrayList<>(numValues);
- for (int j = 0; j < numValues; j++) {
- values.add(in.readString());
- }
- headers.put(key, values);
- }
+ headers.putAll(in.readMapOfLists());
}
/**
@@ -161,7 +152,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
* Unwraps the actual cause from the exception for cases when the exception is a
* {@link ElasticsearchWrapperException}.
*
- * @see org.elasticsearch.ExceptionsHelper#unwrapCause(Throwable)
+ * @see ExceptionsHelper#unwrapCause(Throwable)
*/
public Throwable unwrapCause() {
return ExceptionsHelper.unwrapCause(this);
@@ -200,53 +191,12 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
return rootCause;
}
- /**
- * Check whether this exception contains an exception of the given type:
- * either it is of the given class itself or it contains a nested cause
- * of the given type.
- *
- * @param exType the exception type to look for
- * @return whether there is a nested exception of the specified type
- */
- public boolean contains(Class exType) {
- if (exType == null) {
- return false;
- }
- if (exType.isInstance(this)) {
- return true;
- }
- Throwable cause = getCause();
- if (cause == this) {
- return false;
- }
- if (cause instanceof ElasticsearchException) {
- return ((ElasticsearchException) cause).contains(exType);
- } else {
- while (cause != null) {
- if (exType.isInstance(cause)) {
- return true;
- }
- if (cause.getCause() == cause) {
- break;
- }
- cause = cause.getCause();
- }
- return false;
- }
- }
-
+ @Override
public void writeTo(StreamOutput out) throws IOException {
out.writeOptionalString(this.getMessage());
- out.writeThrowable(this.getCause());
+ out.writeException(this.getCause());
writeStackTraces(this, out);
- out.writeVInt(headers.size());
- for (Map.Entry> entry : headers.entrySet()) {
- out.writeString(entry.getKey());
- out.writeVInt(entry.getValue().size());
- for (String v : entry.getValue()) {
- out.writeString(v);
- }
- }
+ out.writeMapOfLists(headers);
}
public static ElasticsearchException readException(StreamInput input, int id) throws IOException {
@@ -448,7 +398,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
int numSuppressed = in.readVInt();
for (int i = 0; i < numSuppressed; i++) {
- throwable.addSuppressed(in.readThrowable());
+ throwable.addSuppressed(in.readException());
}
return throwable;
}
@@ -468,7 +418,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
Throwable[] suppressed = throwable.getSuppressed();
out.writeVInt(suppressed.length);
for (Throwable t : suppressed) {
- out.writeThrowable(t);
+ out.writeException(t);
}
return throwable;
}
@@ -530,7 +480,8 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
org.elasticsearch.index.shard.IndexShardStartedException::new, 23),
SEARCH_CONTEXT_MISSING_EXCEPTION(org.elasticsearch.search.SearchContextMissingException.class,
org.elasticsearch.search.SearchContextMissingException::new, 24),
- SCRIPT_EXCEPTION(org.elasticsearch.script.ScriptException.class, org.elasticsearch.script.ScriptException::new, 25),
+ GENERAL_SCRIPT_EXCEPTION(org.elasticsearch.script.GeneralScriptException.class,
+ org.elasticsearch.script.GeneralScriptException::new, 25),
BATCH_OPERATION_EXCEPTION(org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException.class,
org.elasticsearch.index.shard.TranslogRecoveryPerformer.BatchOperationException::new, 26),
SNAPSHOT_CREATION_EXCEPTION(org.elasticsearch.snapshots.SnapshotCreationException.class,
@@ -679,8 +630,6 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
org.elasticsearch.index.shard.IndexShardRecoveryException::new, 106),
REPOSITORY_MISSING_EXCEPTION(org.elasticsearch.repositories.RepositoryMissingException.class,
org.elasticsearch.repositories.RepositoryMissingException::new, 107),
- PERCOLATOR_EXCEPTION(org.elasticsearch.index.percolator.PercolatorException.class,
- org.elasticsearch.index.percolator.PercolatorException::new, 108),
DOCUMENT_SOURCE_MISSING_EXCEPTION(org.elasticsearch.index.engine.DocumentSourceMissingException.class,
org.elasticsearch.index.engine.DocumentSourceMissingException::new, 109),
FLUSH_NOT_ALLOWED_ENGINE_EXCEPTION(org.elasticsearch.index.engine.FlushNotAllowedEngineException.class,
@@ -711,8 +660,8 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
org.elasticsearch.indices.IndexAlreadyExistsException::new, 123),
SCRIPT_PARSE_EXCEPTION(org.elasticsearch.script.Script.ScriptParseException.class,
org.elasticsearch.script.Script.ScriptParseException::new, 124),
- HTTP_ON_TRANSPORT_EXCEPTION(org.elasticsearch.transport.netty.SizeHeaderFrameDecoder.HttpOnTransportException.class,
- org.elasticsearch.transport.netty.SizeHeaderFrameDecoder.HttpOnTransportException::new, 125),
+ HTTP_ON_TRANSPORT_EXCEPTION(TcpTransport.HttpOnTransportException.class,
+ TcpTransport.HttpOnTransportException::new, 125),
MAPPER_PARSING_EXCEPTION(org.elasticsearch.index.mapper.MapperParsingException.class,
org.elasticsearch.index.mapper.MapperParsingException::new, 126),
SEARCH_CONTEXT_EXCEPTION(org.elasticsearch.search.SearchContextException.class,
@@ -742,7 +691,8 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
QUERY_SHARD_EXCEPTION(org.elasticsearch.index.query.QueryShardException.class,
org.elasticsearch.index.query.QueryShardException::new, 141),
NO_LONGER_PRIMARY_SHARD_EXCEPTION(ShardStateAction.NoLongerPrimaryShardException.class,
- ShardStateAction.NoLongerPrimaryShardException::new, 142);
+ ShardStateAction.NoLongerPrimaryShardException::new, 142),
+ SCRIPT_EXCEPTION(org.elasticsearch.script.ScriptException.class, org.elasticsearch.script.ScriptException::new, 143);
final Class exceptionClass;
@@ -827,9 +777,9 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
return null;
}
- public static void renderThrowable(XContentBuilder builder, Params params, Throwable t) throws IOException {
+ public static void renderException(XContentBuilder builder, Params params, Exception e) throws IOException {
builder.startObject("error");
- final ElasticsearchException[] rootCauses = ElasticsearchException.guessRootCauses(t);
+ final ElasticsearchException[] rootCauses = ElasticsearchException.guessRootCauses(e);
builder.field("root_cause");
builder.startArray();
for (ElasticsearchException rootCause : rootCauses) {
@@ -839,7 +789,7 @@ public class ElasticsearchException extends RuntimeException implements ToXConte
builder.endObject();
}
builder.endArray();
- ElasticsearchException.toXContent(builder, params, t);
+ ElasticsearchException.toXContent(builder, params, e);
builder.endObject();
}
diff --git a/core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java b/core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java
index f4878fe6f9b..b6cd420c856 100644
--- a/core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java
+++ b/core/src/main/java/org/elasticsearch/ElasticsearchSecurityException.java
@@ -36,7 +36,7 @@ public class ElasticsearchSecurityException extends ElasticsearchException {
this.status = status ;
}
- public ElasticsearchSecurityException(String msg, Throwable cause, Object... args) {
+ public ElasticsearchSecurityException(String msg, Exception cause, Object... args) {
this(msg, ExceptionsHelper.status(cause), cause, args);
}
diff --git a/core/src/main/java/org/elasticsearch/ExceptionsHelper.java b/core/src/main/java/org/elasticsearch/ExceptionsHelper.java
index 3842ab4e3bf..e2af52ccd2c 100644
--- a/core/src/main/java/org/elasticsearch/ExceptionsHelper.java
+++ b/core/src/main/java/org/elasticsearch/ExceptionsHelper.java
@@ -37,25 +37,22 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-/**
- *
- */
public final class ExceptionsHelper {
private static final ESLogger logger = Loggers.getLogger(ExceptionsHelper.class);
- public static RuntimeException convertToRuntime(Throwable t) {
- if (t instanceof RuntimeException) {
- return (RuntimeException) t;
+ public static RuntimeException convertToRuntime(Exception e) {
+ if (e instanceof RuntimeException) {
+ return (RuntimeException) e;
}
- return new ElasticsearchException(t);
+ return new ElasticsearchException(e);
}
- public static ElasticsearchException convertToElastic(Throwable t) {
- if (t instanceof ElasticsearchException) {
- return (ElasticsearchException) t;
+ public static ElasticsearchException convertToElastic(Exception e) {
+ if (e instanceof ElasticsearchException) {
+ return (ElasticsearchException) e;
}
- return new ElasticsearchException(t);
+ return new ElasticsearchException(e);
}
public static RestStatus status(Throwable t) {
@@ -89,15 +86,14 @@ public final class ExceptionsHelper {
return result;
}
+ /**
+ * @deprecated Don't swallow exceptions, allow them to propagate.
+ */
+ @Deprecated
public static String detailedMessage(Throwable t) {
- return detailedMessage(t, false, 0);
- }
-
- public static String detailedMessage(Throwable t, boolean newLines, int initialCounter) {
if (t == null) {
return "Unknown";
}
- int counter = initialCounter + 1;
if (t.getCause() != null) {
StringBuilder sb = new StringBuilder();
while (t != null) {
@@ -107,21 +103,11 @@ public final class ExceptionsHelper {
sb.append(t.getMessage());
sb.append("]");
}
- if (!newLines) {
- sb.append("; ");
- }
+ sb.append("; ");
t = t.getCause();
if (t != null) {
- if (newLines) {
- sb.append("\n");
- for (int i = 0; i < counter; i++) {
- sb.append("\t");
- }
- } else {
- sb.append("nested: ");
- }
+ sb.append("nested: ");
}
- counter++;
}
return sb.toString();
} else {
@@ -175,8 +161,8 @@ public final class ExceptionsHelper {
}
public static IOException unwrapCorruption(Throwable t) {
- return (IOException) unwrap(t, CorruptIndexException.class,
- IndexFormatTooOldException.class,
+ return (IOException) unwrap(t, CorruptIndexException.class,
+ IndexFormatTooOldException.class,
IndexFormatTooNewException.class);
}
@@ -220,7 +206,6 @@ public final class ExceptionsHelper {
return true;
}
-
/**
* Deduplicate the failures by exception message and index.
*/
diff --git a/core/src/main/java/org/elasticsearch/ResourceNotFoundException.java b/core/src/main/java/org/elasticsearch/ResourceNotFoundException.java
index d38de2e3bc1..d408fdef033 100644
--- a/core/src/main/java/org/elasticsearch/ResourceNotFoundException.java
+++ b/core/src/main/java/org/elasticsearch/ResourceNotFoundException.java
@@ -32,7 +32,7 @@ public class ResourceNotFoundException extends ElasticsearchException {
super(msg, args);
}
- protected ResourceNotFoundException(String msg, Throwable cause, Object... args) {
+ public ResourceNotFoundException(String msg, Throwable cause, Object... args) {
super(msg, cause, args);
}
diff --git a/core/src/main/java/org/elasticsearch/Version.java b/core/src/main/java/org/elasticsearch/Version.java
index 56d245ddc51..da876730b9a 100644
--- a/core/src/main/java/org/elasticsearch/Version.java
+++ b/core/src/main/java/org/elasticsearch/Version.java
@@ -22,7 +22,6 @@ package org.elasticsearch;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.SuppressForbidden;
-import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings;
@@ -32,7 +31,6 @@ import java.io.IOException;
/**
*/
-@SuppressWarnings("deprecation")
public class Version {
/*
* 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
@@ -69,11 +67,21 @@ public class Version {
public static final Version V_2_3_1 = new Version(V_2_3_1_ID, org.apache.lucene.util.Version.LUCENE_5_5_0);
public static final int V_2_3_2_ID = 2030299;
public static final Version V_2_3_2 = new Version(V_2_3_2_ID, org.apache.lucene.util.Version.LUCENE_5_5_0);
+ public static final int V_2_3_3_ID = 2030399;
+ public static final Version V_2_3_3 = new Version(V_2_3_3_ID, org.apache.lucene.util.Version.LUCENE_5_5_0);
+ public static final int V_2_3_4_ID = 2030499;
+ public static final Version V_2_3_4 = new Version(V_2_3_4_ID, org.apache.lucene.util.Version.LUCENE_5_5_0);
public static final int V_5_0_0_alpha1_ID = 5000001;
public static final Version V_5_0_0_alpha1 = new Version(V_5_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_6_0_0);
public static final int V_5_0_0_alpha2_ID = 5000002;
public static final Version V_5_0_0_alpha2 = new Version(V_5_0_0_alpha2_ID, org.apache.lucene.util.Version.LUCENE_6_0_0);
- public static final Version CURRENT = V_5_0_0_alpha2;
+ public static final int V_5_0_0_alpha3_ID = 5000003;
+ public static final Version V_5_0_0_alpha3 = new Version(V_5_0_0_alpha3_ID, org.apache.lucene.util.Version.LUCENE_6_0_0);
+ public static final int V_5_0_0_alpha4_ID = 5000004;
+ public static final Version V_5_0_0_alpha4 = new Version(V_5_0_0_alpha4_ID, org.apache.lucene.util.Version.LUCENE_6_1_0);
+ public static final int V_5_0_0_alpha5_ID = 5000005;
+ public static final Version V_5_0_0_alpha5 = new Version(V_5_0_0_alpha5_ID, org.apache.lucene.util.Version.LUCENE_6_1_0);
+ public static final Version CURRENT = V_5_0_0_alpha5;
static {
assert CURRENT.luceneVersion.equals(org.apache.lucene.util.Version.LATEST) : "Version must be upgraded to ["
@@ -86,10 +94,20 @@ public class Version {
public static Version fromId(int id) {
switch (id) {
+ case V_5_0_0_alpha5_ID:
+ return V_5_0_0_alpha5;
+ case V_5_0_0_alpha4_ID:
+ return V_5_0_0_alpha4;
+ case V_5_0_0_alpha3_ID:
+ return V_5_0_0_alpha3;
case V_5_0_0_alpha2_ID:
return V_5_0_0_alpha2;
case V_5_0_0_alpha1_ID:
return V_5_0_0_alpha1;
+ case V_2_3_4_ID:
+ return V_2_3_4;
+ case V_2_3_3_ID:
+ return V_2_3_3;
case V_2_3_2_ID:
return V_2_3_2;
case V_2_3_1_ID:
@@ -318,18 +336,4 @@ public class Version {
public boolean isRC() {
return build > 50 && build < 99;
}
-
- public static class Module extends AbstractModule {
-
- private final Version version;
-
- public Module(Version version) {
- this.version = version;
- }
-
- @Override
- protected void configure() {
- bind(Version.class).toInstance(version);
- }
- }
}
diff --git a/core/src/main/java/org/elasticsearch/action/ActionListener.java b/core/src/main/java/org/elasticsearch/action/ActionListener.java
index 8447d6cef08..e7d5ecd8d64 100644
--- a/core/src/main/java/org/elasticsearch/action/ActionListener.java
+++ b/core/src/main/java/org/elasticsearch/action/ActionListener.java
@@ -32,5 +32,5 @@ public interface ActionListener {
/**
* A failure caused by an exception at some phase of the task.
*/
- void onFailure(Throwable e);
+ void onFailure(Exception e);
}
diff --git a/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java b/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java
index 6cdc1c3194f..e0e04652315 100644
--- a/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java
+++ b/core/src/main/java/org/elasticsearch/action/ActionListenerResponseHandler.java
@@ -20,7 +20,7 @@
package org.elasticsearch.action;
import org.elasticsearch.threadpool.ThreadPool;
-import org.elasticsearch.transport.BaseTransportResponseHandler;
+import org.elasticsearch.transport.TransportResponseHandler;
import org.elasticsearch.transport.TransportException;
import org.elasticsearch.transport.TransportResponse;
@@ -31,7 +31,7 @@ import java.util.function.Supplier;
* A simple base class for action response listeners, defaulting to using the SAME executor (as its
* very common on response handlers).
*/
-public class ActionListenerResponseHandler extends BaseTransportResponseHandler {
+public class ActionListenerResponseHandler implements TransportResponseHandler {
private final ActionListener listener;
private final Supplier responseSupplier;
diff --git a/core/src/main/java/org/elasticsearch/action/ActionModule.java b/core/src/main/java/org/elasticsearch/action/ActionModule.java
index 3e93f699645..46494f4ebdc 100644
--- a/core/src/main/java/org/elasticsearch/action/ActionModule.java
+++ b/core/src/main/java/org/elasticsearch/action/ActionModule.java
@@ -19,6 +19,12 @@
package org.elasticsearch.action;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.elasticsearch.action.admin.cluster.allocation.ClusterAllocationExplainAction;
import org.elasticsearch.action.admin.cluster.allocation.TransportClusterAllocationExplainAction;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthAction;
@@ -32,6 +38,8 @@ import org.elasticsearch.action.admin.cluster.node.stats.NodesStatsAction;
import org.elasticsearch.action.admin.cluster.node.stats.TransportNodesStatsAction;
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksAction;
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.TransportCancelTasksAction;
+import org.elasticsearch.action.admin.cluster.node.tasks.get.GetTaskAction;
+import org.elasticsearch.action.admin.cluster.node.tasks.get.TransportGetTaskAction;
import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksAction;
import org.elasticsearch.action.admin.cluster.node.tasks.list.TransportListTasksAction;
import org.elasticsearch.action.admin.cluster.repositories.delete.DeleteRepositoryAction;
@@ -62,10 +70,14 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateAction;
import org.elasticsearch.action.admin.cluster.state.TransportClusterStateAction;
import org.elasticsearch.action.admin.cluster.stats.ClusterStatsAction;
import org.elasticsearch.action.admin.cluster.stats.TransportClusterStatsAction;
+import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptAction;
+import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptAction;
+import org.elasticsearch.action.admin.cluster.storedscripts.PutStoredScriptAction;
+import org.elasticsearch.action.admin.cluster.storedscripts.TransportDeleteStoredScriptAction;
+import org.elasticsearch.action.admin.cluster.storedscripts.TransportGetStoredScriptAction;
+import org.elasticsearch.action.admin.cluster.storedscripts.TransportPutStoredScriptAction;
import org.elasticsearch.action.admin.cluster.tasks.PendingClusterTasksAction;
import org.elasticsearch.action.admin.cluster.tasks.TransportPendingClusterTasksAction;
-import org.elasticsearch.action.admin.cluster.validate.template.RenderSearchTemplateAction;
-import org.elasticsearch.action.admin.cluster.validate.template.TransportRenderSearchTemplateAction;
import org.elasticsearch.action.admin.indices.alias.IndicesAliasesAction;
import org.elasticsearch.action.admin.indices.alias.TransportIndicesAliasesAction;
import org.elasticsearch.action.admin.indices.alias.exists.AliasesExistAction;
@@ -107,6 +119,8 @@ import org.elasticsearch.action.admin.indices.recovery.RecoveryAction;
import org.elasticsearch.action.admin.indices.recovery.TransportRecoveryAction;
import org.elasticsearch.action.admin.indices.refresh.RefreshAction;
import org.elasticsearch.action.admin.indices.refresh.TransportRefreshAction;
+import org.elasticsearch.action.admin.indices.rollover.RolloverAction;
+import org.elasticsearch.action.admin.indices.rollover.TransportRolloverAction;
import org.elasticsearch.action.admin.indices.segments.IndicesSegmentsAction;
import org.elasticsearch.action.admin.indices.segments.TransportIndicesSegmentsAction;
import org.elasticsearch.action.admin.indices.settings.get.GetSettingsAction;
@@ -115,6 +129,8 @@ import org.elasticsearch.action.admin.indices.settings.put.TransportUpdateSettin
import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsAction;
import org.elasticsearch.action.admin.indices.shards.IndicesShardStoresAction;
import org.elasticsearch.action.admin.indices.shards.TransportIndicesShardStoresAction;
+import org.elasticsearch.action.admin.indices.shrink.ShrinkAction;
+import org.elasticsearch.action.admin.indices.shrink.TransportShrinkAction;
import org.elasticsearch.action.admin.indices.stats.IndicesStatsAction;
import org.elasticsearch.action.admin.indices.stats.TransportIndicesStatsAction;
import org.elasticsearch.action.admin.indices.template.delete.DeleteIndexTemplateAction;
@@ -139,7 +155,7 @@ import org.elasticsearch.action.delete.TransportDeleteAction;
import org.elasticsearch.action.explain.ExplainAction;
import org.elasticsearch.action.explain.TransportExplainAction;
import org.elasticsearch.action.fieldstats.FieldStatsAction;
-import org.elasticsearch.action.fieldstats.TransportFieldStatsTransportAction;
+import org.elasticsearch.action.fieldstats.TransportFieldStatsAction;
import org.elasticsearch.action.get.GetAction;
import org.elasticsearch.action.get.MultiGetAction;
import org.elasticsearch.action.get.TransportGetAction;
@@ -147,28 +163,18 @@ import org.elasticsearch.action.get.TransportMultiGetAction;
import org.elasticsearch.action.get.TransportShardMultiGetAction;
import org.elasticsearch.action.index.IndexAction;
import org.elasticsearch.action.index.TransportIndexAction;
-import org.elasticsearch.action.admin.cluster.storedscripts.DeleteStoredScriptAction;
-import org.elasticsearch.action.admin.cluster.storedscripts.TransportDeleteStoredScriptAction;
-import org.elasticsearch.action.admin.cluster.storedscripts.GetStoredScriptAction;
-import org.elasticsearch.action.admin.cluster.storedscripts.TransportGetStoredScriptAction;
-import org.elasticsearch.action.admin.cluster.storedscripts.PutStoredScriptAction;
-import org.elasticsearch.action.admin.cluster.storedscripts.TransportPutStoredScriptAction;
-import org.elasticsearch.action.ingest.IngestActionFilter;
-import org.elasticsearch.action.ingest.IngestProxyActionFilter;
import org.elasticsearch.action.ingest.DeletePipelineAction;
import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
import org.elasticsearch.action.ingest.GetPipelineAction;
import org.elasticsearch.action.ingest.GetPipelineTransportAction;
+import org.elasticsearch.action.ingest.IngestActionFilter;
+import org.elasticsearch.action.ingest.IngestProxyActionFilter;
import org.elasticsearch.action.ingest.PutPipelineAction;
import org.elasticsearch.action.ingest.PutPipelineTransportAction;
import org.elasticsearch.action.ingest.SimulatePipelineAction;
import org.elasticsearch.action.ingest.SimulatePipelineTransportAction;
import org.elasticsearch.action.main.MainAction;
import org.elasticsearch.action.main.TransportMainAction;
-import org.elasticsearch.action.percolate.MultiPercolateAction;
-import org.elasticsearch.action.percolate.PercolateAction;
-import org.elasticsearch.action.percolate.TransportMultiPercolateAction;
-import org.elasticsearch.action.percolate.TransportPercolateAction;
import org.elasticsearch.action.search.ClearScrollAction;
import org.elasticsearch.action.search.MultiSearchAction;
import org.elasticsearch.action.search.SearchAction;
@@ -189,189 +195,470 @@ import org.elasticsearch.action.termvectors.TransportShardMultiTermsVectorAction
import org.elasticsearch.action.termvectors.TransportTermVectorsAction;
import org.elasticsearch.action.update.TransportUpdateAction;
import org.elasticsearch.action.update.UpdateAction;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.common.NamedRegistry;
import org.elasticsearch.common.inject.AbstractModule;
import org.elasticsearch.common.inject.multibindings.MapBinder;
import org.elasticsearch.common.inject.multibindings.Multibinder;
+import org.elasticsearch.common.network.NetworkModule;
+import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.plugins.ActionPlugin;
+import org.elasticsearch.plugins.ActionPlugin.ActionHandler;
+import org.elasticsearch.rest.RestController;
+import org.elasticsearch.rest.RestHandler;
+import org.elasticsearch.rest.action.admin.cluster.allocation.RestClusterAllocationExplainAction;
+import org.elasticsearch.rest.action.admin.cluster.health.RestClusterHealthAction;
+import org.elasticsearch.rest.action.admin.cluster.node.hotthreads.RestNodesHotThreadsAction;
+import org.elasticsearch.rest.action.admin.cluster.node.info.RestNodesInfoAction;
+import org.elasticsearch.rest.action.admin.cluster.node.stats.RestNodesStatsAction;
+import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestCancelTasksAction;
+import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestGetTaskAction;
+import org.elasticsearch.rest.action.admin.cluster.node.tasks.RestListTasksAction;
+import org.elasticsearch.rest.action.admin.cluster.repositories.delete.RestDeleteRepositoryAction;
+import org.elasticsearch.rest.action.admin.cluster.repositories.get.RestGetRepositoriesAction;
+import org.elasticsearch.rest.action.admin.cluster.repositories.put.RestPutRepositoryAction;
+import org.elasticsearch.rest.action.admin.cluster.repositories.verify.RestVerifyRepositoryAction;
+import org.elasticsearch.rest.action.admin.cluster.reroute.RestClusterRerouteAction;
+import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterGetSettingsAction;
+import org.elasticsearch.rest.action.admin.cluster.settings.RestClusterUpdateSettingsAction;
+import org.elasticsearch.rest.action.admin.cluster.shards.RestClusterSearchShardsAction;
+import org.elasticsearch.rest.action.admin.cluster.snapshots.create.RestCreateSnapshotAction;
+import org.elasticsearch.rest.action.admin.cluster.snapshots.delete.RestDeleteSnapshotAction;
+import org.elasticsearch.rest.action.admin.cluster.snapshots.get.RestGetSnapshotsAction;
+import org.elasticsearch.rest.action.admin.cluster.snapshots.restore.RestRestoreSnapshotAction;
+import org.elasticsearch.rest.action.admin.cluster.snapshots.status.RestSnapshotsStatusAction;
+import org.elasticsearch.rest.action.admin.cluster.state.RestClusterStateAction;
+import org.elasticsearch.rest.action.admin.cluster.stats.RestClusterStatsAction;
+import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestDeleteStoredScriptAction;
+import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestGetStoredScriptAction;
+import org.elasticsearch.rest.action.admin.cluster.storedscripts.RestPutStoredScriptAction;
+import org.elasticsearch.rest.action.admin.cluster.tasks.RestPendingClusterTasksAction;
+import org.elasticsearch.rest.action.admin.indices.RestRolloverIndexAction;
+import org.elasticsearch.rest.action.admin.indices.RestShrinkIndexAction;
+import org.elasticsearch.rest.action.admin.indices.alias.RestIndicesAliasesAction;
+import org.elasticsearch.rest.action.admin.indices.alias.delete.RestIndexDeleteAliasesAction;
+import org.elasticsearch.rest.action.admin.indices.alias.get.RestGetAliasesAction;
+import org.elasticsearch.rest.action.admin.indices.alias.head.RestAliasesExistAction;
+import org.elasticsearch.rest.action.admin.indices.alias.put.RestIndexPutAliasAction;
+import org.elasticsearch.rest.action.admin.indices.analyze.RestAnalyzeAction;
+import org.elasticsearch.rest.action.admin.indices.cache.clear.RestClearIndicesCacheAction;
+import org.elasticsearch.rest.action.admin.indices.close.RestCloseIndexAction;
+import org.elasticsearch.rest.action.admin.indices.create.RestCreateIndexAction;
+import org.elasticsearch.rest.action.admin.indices.delete.RestDeleteIndexAction;
+import org.elasticsearch.rest.action.admin.indices.exists.indices.RestIndicesExistsAction;
+import org.elasticsearch.rest.action.admin.indices.exists.types.RestTypesExistsAction;
+import org.elasticsearch.rest.action.admin.indices.flush.RestFlushAction;
+import org.elasticsearch.rest.action.admin.indices.flush.RestSyncedFlushAction;
+import org.elasticsearch.rest.action.admin.indices.forcemerge.RestForceMergeAction;
+import org.elasticsearch.rest.action.admin.indices.get.RestGetIndicesAction;
+import org.elasticsearch.rest.action.admin.indices.mapping.get.RestGetFieldMappingAction;
+import org.elasticsearch.rest.action.admin.indices.mapping.get.RestGetMappingAction;
+import org.elasticsearch.rest.action.admin.indices.mapping.put.RestPutMappingAction;
+import org.elasticsearch.rest.action.admin.indices.open.RestOpenIndexAction;
+import org.elasticsearch.rest.action.admin.indices.recovery.RestRecoveryAction;
+import org.elasticsearch.rest.action.admin.indices.refresh.RestRefreshAction;
+import org.elasticsearch.rest.action.admin.indices.segments.RestIndicesSegmentsAction;
+import org.elasticsearch.rest.action.admin.indices.settings.RestGetSettingsAction;
+import org.elasticsearch.rest.action.admin.indices.settings.RestUpdateSettingsAction;
+import org.elasticsearch.rest.action.admin.indices.shards.RestIndicesShardStoresAction;
+import org.elasticsearch.rest.action.admin.indices.stats.RestIndicesStatsAction;
+import org.elasticsearch.rest.action.admin.indices.template.delete.RestDeleteIndexTemplateAction;
+import org.elasticsearch.rest.action.admin.indices.template.get.RestGetIndexTemplateAction;
+import org.elasticsearch.rest.action.admin.indices.template.head.RestHeadIndexTemplateAction;
+import org.elasticsearch.rest.action.admin.indices.template.put.RestPutIndexTemplateAction;
+import org.elasticsearch.rest.action.admin.indices.upgrade.RestUpgradeAction;
+import org.elasticsearch.rest.action.admin.indices.validate.query.RestValidateQueryAction;
+import org.elasticsearch.rest.action.bulk.RestBulkAction;
+import org.elasticsearch.rest.action.cat.AbstractCatAction;
+import org.elasticsearch.rest.action.cat.RestAliasAction;
+import org.elasticsearch.rest.action.cat.RestAllocationAction;
+import org.elasticsearch.rest.action.cat.RestCatAction;
+import org.elasticsearch.rest.action.cat.RestFielddataAction;
+import org.elasticsearch.rest.action.cat.RestHealthAction;
+import org.elasticsearch.rest.action.cat.RestIndicesAction;
+import org.elasticsearch.rest.action.cat.RestMasterAction;
+import org.elasticsearch.rest.action.cat.RestNodeAttrsAction;
+import org.elasticsearch.rest.action.cat.RestNodesAction;
+import org.elasticsearch.rest.action.cat.RestPluginsAction;
+import org.elasticsearch.rest.action.cat.RestRepositoriesAction;
+import org.elasticsearch.rest.action.cat.RestSegmentsAction;
+import org.elasticsearch.rest.action.cat.RestShardsAction;
+import org.elasticsearch.rest.action.cat.RestSnapshotAction;
+import org.elasticsearch.rest.action.cat.RestTasksAction;
+import org.elasticsearch.rest.action.cat.RestThreadPoolAction;
+import org.elasticsearch.rest.action.delete.RestDeleteAction;
+import org.elasticsearch.rest.action.explain.RestExplainAction;
+import org.elasticsearch.rest.action.fieldstats.RestFieldStatsAction;
+import org.elasticsearch.rest.action.get.RestGetAction;
+import org.elasticsearch.rest.action.get.RestGetSourceAction;
+import org.elasticsearch.rest.action.get.RestHeadAction;
+import org.elasticsearch.rest.action.get.RestMultiGetAction;
+import org.elasticsearch.rest.action.index.RestIndexAction;
+import org.elasticsearch.rest.action.ingest.RestDeletePipelineAction;
+import org.elasticsearch.rest.action.ingest.RestGetPipelineAction;
+import org.elasticsearch.rest.action.ingest.RestPutPipelineAction;
+import org.elasticsearch.rest.action.ingest.RestSimulatePipelineAction;
+import org.elasticsearch.rest.action.main.RestMainAction;
+import org.elasticsearch.rest.action.search.RestClearScrollAction;
+import org.elasticsearch.rest.action.search.RestMultiSearchAction;
+import org.elasticsearch.rest.action.search.RestSearchAction;
+import org.elasticsearch.rest.action.search.RestSearchScrollAction;
+import org.elasticsearch.rest.action.suggest.RestSuggestAction;
+import org.elasticsearch.rest.action.termvectors.RestMultiTermVectorsAction;
+import org.elasticsearch.rest.action.termvectors.RestTermVectorsAction;
+import org.elasticsearch.rest.action.update.RestUpdateAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
/**
- *
+ * Builds and binds the generic action map, all {@link TransportAction}s, and {@link ActionFilters}.
*/
public class ActionModule extends AbstractModule {
- private final Map actions = new HashMap<>();
- private final List> actionFilters = new ArrayList<>();
+ private final boolean transportClient;
+ private final Settings settings;
+ private final List actionPlugins;
+ private final Map> actions;
+ private final List> actionFilters;
+ private final AutoCreateIndex autoCreateIndex;
+ private final DestructiveOperations destructiveOperations;
+ private final RestController restController;
- static class ActionEntry, Response extends ActionResponse> {
- public final GenericAction action;
- public final Class> transportAction;
- public final Class[] supportTransportActions;
+ public ActionModule(boolean ingestEnabled, boolean transportClient, Settings settings, IndexNameExpressionResolver resolver,
+ ClusterSettings clusterSettings, List actionPlugins) {
+ this.transportClient = transportClient;
+ this.settings = settings;
+ this.actionPlugins = actionPlugins;
+ actions = setupActions(actionPlugins);
+ actionFilters = setupActionFilters(actionPlugins, ingestEnabled);
+ autoCreateIndex = transportClient ? null : new AutoCreateIndex(settings, resolver);
+ destructiveOperations = new DestructiveOperations(settings, clusterSettings);
+ restController = new RestController(settings);
+ }
- ActionEntry(GenericAction action, Class> transportAction, Class... supportTransportActions) {
- this.action = action;
- this.transportAction = transportAction;
- this.supportTransportActions = supportTransportActions;
+ public Map> getActions() {
+ return actions;
+ }
+
+ static Map> setupActions(List actionPlugins) {
+ // Subclass NamedRegistry for easy registration
+ class ActionRegistry extends NamedRegistry> {
+ public ActionRegistry() {
+ super("action");
+ }
+
+ public void register(ActionHandler handler) {
+ register(handler.getAction().name(), handler);
+ }
+
+ public , Response extends ActionResponse> void register(
+ GenericAction action, Class> transportAction,
+ Class... supportTransportActions) {
+ register(new ActionHandler<>(action, transportAction, supportTransportActions));
+ }
}
+ ActionRegistry actions = new ActionRegistry();
+
+ actions.register(MainAction.INSTANCE, TransportMainAction.class);
+ actions.register(NodesInfoAction.INSTANCE, TransportNodesInfoAction.class);
+ actions.register(NodesStatsAction.INSTANCE, TransportNodesStatsAction.class);
+ actions.register(NodesHotThreadsAction.INSTANCE, TransportNodesHotThreadsAction.class);
+ actions.register(ListTasksAction.INSTANCE, TransportListTasksAction.class);
+ actions.register(GetTaskAction.INSTANCE, TransportGetTaskAction.class);
+ actions.register(CancelTasksAction.INSTANCE, TransportCancelTasksAction.class);
+
+ actions.register(ClusterAllocationExplainAction.INSTANCE, TransportClusterAllocationExplainAction.class);
+ actions.register(ClusterStatsAction.INSTANCE, TransportClusterStatsAction.class);
+ actions.register(ClusterStateAction.INSTANCE, TransportClusterStateAction.class);
+ actions.register(ClusterHealthAction.INSTANCE, TransportClusterHealthAction.class);
+ actions.register(ClusterUpdateSettingsAction.INSTANCE, TransportClusterUpdateSettingsAction.class);
+ actions.register(ClusterRerouteAction.INSTANCE, TransportClusterRerouteAction.class);
+ actions.register(ClusterSearchShardsAction.INSTANCE, TransportClusterSearchShardsAction.class);
+ actions.register(PendingClusterTasksAction.INSTANCE, TransportPendingClusterTasksAction.class);
+ actions.register(PutRepositoryAction.INSTANCE, TransportPutRepositoryAction.class);
+ actions.register(GetRepositoriesAction.INSTANCE, TransportGetRepositoriesAction.class);
+ actions.register(DeleteRepositoryAction.INSTANCE, TransportDeleteRepositoryAction.class);
+ actions.register(VerifyRepositoryAction.INSTANCE, TransportVerifyRepositoryAction.class);
+ actions.register(GetSnapshotsAction.INSTANCE, TransportGetSnapshotsAction.class);
+ actions.register(DeleteSnapshotAction.INSTANCE, TransportDeleteSnapshotAction.class);
+ actions.register(CreateSnapshotAction.INSTANCE, TransportCreateSnapshotAction.class);
+ actions.register(RestoreSnapshotAction.INSTANCE, TransportRestoreSnapshotAction.class);
+ actions.register(SnapshotsStatusAction.INSTANCE, TransportSnapshotsStatusAction.class);
+
+ actions.register(IndicesStatsAction.INSTANCE, TransportIndicesStatsAction.class);
+ actions.register(IndicesSegmentsAction.INSTANCE, TransportIndicesSegmentsAction.class);
+ actions.register(IndicesShardStoresAction.INSTANCE, TransportIndicesShardStoresAction.class);
+ actions.register(CreateIndexAction.INSTANCE, TransportCreateIndexAction.class);
+ actions.register(ShrinkAction.INSTANCE, TransportShrinkAction.class);
+ actions.register(RolloverAction.INSTANCE, TransportRolloverAction.class);
+ actions.register(DeleteIndexAction.INSTANCE, TransportDeleteIndexAction.class);
+ actions.register(GetIndexAction.INSTANCE, TransportGetIndexAction.class);
+ actions.register(OpenIndexAction.INSTANCE, TransportOpenIndexAction.class);
+ actions.register(CloseIndexAction.INSTANCE, TransportCloseIndexAction.class);
+ actions.register(IndicesExistsAction.INSTANCE, TransportIndicesExistsAction.class);
+ actions.register(TypesExistsAction.INSTANCE, TransportTypesExistsAction.class);
+ actions.register(GetMappingsAction.INSTANCE, TransportGetMappingsAction.class);
+ actions.register(GetFieldMappingsAction.INSTANCE, TransportGetFieldMappingsAction.class,
+ TransportGetFieldMappingsIndexAction.class);
+ actions.register(PutMappingAction.INSTANCE, TransportPutMappingAction.class);
+ actions.register(IndicesAliasesAction.INSTANCE, TransportIndicesAliasesAction.class);
+ actions.register(UpdateSettingsAction.INSTANCE, TransportUpdateSettingsAction.class);
+ actions.register(AnalyzeAction.INSTANCE, TransportAnalyzeAction.class);
+ actions.register(PutIndexTemplateAction.INSTANCE, TransportPutIndexTemplateAction.class);
+ actions.register(GetIndexTemplatesAction.INSTANCE, TransportGetIndexTemplatesAction.class);
+ actions.register(DeleteIndexTemplateAction.INSTANCE, TransportDeleteIndexTemplateAction.class);
+ actions.register(ValidateQueryAction.INSTANCE, TransportValidateQueryAction.class);
+ actions.register(RefreshAction.INSTANCE, TransportRefreshAction.class);
+ actions.register(FlushAction.INSTANCE, TransportFlushAction.class);
+ actions.register(SyncedFlushAction.INSTANCE, TransportSyncedFlushAction.class);
+ actions.register(ForceMergeAction.INSTANCE, TransportForceMergeAction.class);
+ actions.register(UpgradeAction.INSTANCE, TransportUpgradeAction.class);
+ actions.register(UpgradeStatusAction.INSTANCE, TransportUpgradeStatusAction.class);
+ actions.register(UpgradeSettingsAction.INSTANCE, TransportUpgradeSettingsAction.class);
+ actions.register(ClearIndicesCacheAction.INSTANCE, TransportClearIndicesCacheAction.class);
+ actions.register(GetAliasesAction.INSTANCE, TransportGetAliasesAction.class);
+ actions.register(AliasesExistAction.INSTANCE, TransportAliasesExistAction.class);
+ actions.register(GetSettingsAction.INSTANCE, TransportGetSettingsAction.class);
+
+ actions.register(IndexAction.INSTANCE, TransportIndexAction.class);
+ actions.register(GetAction.INSTANCE, TransportGetAction.class);
+ actions.register(TermVectorsAction.INSTANCE, TransportTermVectorsAction.class);
+ actions.register(MultiTermVectorsAction.INSTANCE, TransportMultiTermVectorsAction.class,
+ TransportShardMultiTermsVectorAction.class);
+ actions.register(DeleteAction.INSTANCE, TransportDeleteAction.class);
+ actions.register(UpdateAction.INSTANCE, TransportUpdateAction.class);
+ actions.register(MultiGetAction.INSTANCE, TransportMultiGetAction.class,
+ TransportShardMultiGetAction.class);
+ actions.register(BulkAction.INSTANCE, TransportBulkAction.class,
+ TransportShardBulkAction.class);
+ actions.register(SearchAction.INSTANCE, TransportSearchAction.class);
+ actions.register(SearchScrollAction.INSTANCE, TransportSearchScrollAction.class);
+ actions.register(MultiSearchAction.INSTANCE, TransportMultiSearchAction.class);
+ actions.register(ExplainAction.INSTANCE, TransportExplainAction.class);
+ actions.register(ClearScrollAction.INSTANCE, TransportClearScrollAction.class);
+ actions.register(RecoveryAction.INSTANCE, TransportRecoveryAction.class);
+
+ //Indexed scripts
+ actions.register(PutStoredScriptAction.INSTANCE, TransportPutStoredScriptAction.class);
+ actions.register(GetStoredScriptAction.INSTANCE, TransportGetStoredScriptAction.class);
+ actions.register(DeleteStoredScriptAction.INSTANCE, TransportDeleteStoredScriptAction.class);
+
+ actions.register(FieldStatsAction.INSTANCE, TransportFieldStatsAction.class);
+
+ actions.register(PutPipelineAction.INSTANCE, PutPipelineTransportAction.class);
+ actions.register(GetPipelineAction.INSTANCE, GetPipelineTransportAction.class);
+ actions.register(DeletePipelineAction.INSTANCE, DeletePipelineTransportAction.class);
+ actions.register(SimulatePipelineAction.INSTANCE, SimulatePipelineTransportAction.class);
+
+ actionPlugins.stream().flatMap(p -> p.getActions().stream()).forEach(actions::register);
+
+ return unmodifiableMap(actions.getRegistry());
}
- private final boolean ingestEnabled;
- private final boolean proxy;
+ private List> setupActionFilters(List actionPlugins, boolean ingestEnabled) {
+ List> filters = new ArrayList<>();
+ if (transportClient == false) {
+ if (ingestEnabled) {
+ filters.add(IngestActionFilter.class);
+ } else {
+ filters.add(IngestProxyActionFilter.class);
+ }
+ }
- public ActionModule(boolean ingestEnabled, boolean proxy) {
- this.ingestEnabled = ingestEnabled;
- this.proxy = proxy;
+ for (ActionPlugin plugin : actionPlugins) {
+ filters.addAll(plugin.getActionFilters());
+ }
+ return unmodifiableList(filters);
}
- /**
- * Registers an action.
- *
- * @param action The action type.
- * @param transportAction The transport action implementing the actual action.
- * @param supportTransportActions Any support actions that are needed by the transport action.
- * @param The request type.
- * @param The response type.
- */
- public , Response extends ActionResponse> void registerAction(GenericAction action, Class> transportAction, Class... supportTransportActions) {
- actions.put(action.name(), new ActionEntry<>(action, transportAction, supportTransportActions));
+ static Set> setupRestHandlers(List actionPlugins) {
+ Set> handlers = new HashSet<>();
+ registerRestHandler(handlers, RestMainAction.class);
+ registerRestHandler(handlers, RestNodesInfoAction.class);
+ registerRestHandler(handlers, RestNodesStatsAction.class);
+ registerRestHandler(handlers, RestNodesHotThreadsAction.class);
+ registerRestHandler(handlers, RestClusterAllocationExplainAction.class);
+ registerRestHandler(handlers, RestClusterStatsAction.class);
+ registerRestHandler(handlers, RestClusterStateAction.class);
+ registerRestHandler(handlers, RestClusterHealthAction.class);
+ registerRestHandler(handlers, RestClusterUpdateSettingsAction.class);
+ registerRestHandler(handlers, RestClusterGetSettingsAction.class);
+ registerRestHandler(handlers, RestClusterRerouteAction.class);
+ registerRestHandler(handlers, RestClusterSearchShardsAction.class);
+ registerRestHandler(handlers, RestPendingClusterTasksAction.class);
+ registerRestHandler(handlers, RestPutRepositoryAction.class);
+ registerRestHandler(handlers, RestGetRepositoriesAction.class);
+ registerRestHandler(handlers, RestDeleteRepositoryAction.class);
+ registerRestHandler(handlers, RestVerifyRepositoryAction.class);
+ registerRestHandler(handlers, RestGetSnapshotsAction.class);
+ registerRestHandler(handlers, RestCreateSnapshotAction.class);
+ registerRestHandler(handlers, RestRestoreSnapshotAction.class);
+ registerRestHandler(handlers, RestDeleteSnapshotAction.class);
+ registerRestHandler(handlers, RestSnapshotsStatusAction.class);
+
+ registerRestHandler(handlers, RestIndicesExistsAction.class);
+ registerRestHandler(handlers, RestTypesExistsAction.class);
+ registerRestHandler(handlers, RestGetIndicesAction.class);
+ registerRestHandler(handlers, RestIndicesStatsAction.class);
+ registerRestHandler(handlers, RestIndicesSegmentsAction.class);
+ registerRestHandler(handlers, RestIndicesShardStoresAction.class);
+ registerRestHandler(handlers, RestGetAliasesAction.class);
+ registerRestHandler(handlers, RestAliasesExistAction.class);
+ registerRestHandler(handlers, RestIndexDeleteAliasesAction.class);
+ registerRestHandler(handlers, RestIndexPutAliasAction.class);
+ registerRestHandler(handlers, RestIndicesAliasesAction.class);
+ registerRestHandler(handlers, RestCreateIndexAction.class);
+ registerRestHandler(handlers, RestShrinkIndexAction.class);
+ registerRestHandler(handlers, RestRolloverIndexAction.class);
+ registerRestHandler(handlers, RestDeleteIndexAction.class);
+ registerRestHandler(handlers, RestCloseIndexAction.class);
+ registerRestHandler(handlers, RestOpenIndexAction.class);
+
+ registerRestHandler(handlers, RestUpdateSettingsAction.class);
+ registerRestHandler(handlers, RestGetSettingsAction.class);
+
+ registerRestHandler(handlers, RestAnalyzeAction.class);
+ registerRestHandler(handlers, RestGetIndexTemplateAction.class);
+ registerRestHandler(handlers, RestPutIndexTemplateAction.class);
+ registerRestHandler(handlers, RestDeleteIndexTemplateAction.class);
+ registerRestHandler(handlers, RestHeadIndexTemplateAction.class);
+
+ registerRestHandler(handlers, RestPutMappingAction.class);
+ registerRestHandler(handlers, RestGetMappingAction.class);
+ registerRestHandler(handlers, RestGetFieldMappingAction.class);
+
+ registerRestHandler(handlers, RestRefreshAction.class);
+ registerRestHandler(handlers, RestFlushAction.class);
+ registerRestHandler(handlers, RestSyncedFlushAction.class);
+ registerRestHandler(handlers, RestForceMergeAction.class);
+ registerRestHandler(handlers, RestUpgradeAction.class);
+ registerRestHandler(handlers, RestClearIndicesCacheAction.class);
+
+ registerRestHandler(handlers, RestIndexAction.class);
+ registerRestHandler(handlers, RestGetAction.class);
+ registerRestHandler(handlers, RestGetSourceAction.class);
+ registerRestHandler(handlers, RestHeadAction.Document.class);
+ registerRestHandler(handlers, RestHeadAction.Source.class);
+ registerRestHandler(handlers, RestMultiGetAction.class);
+ registerRestHandler(handlers, RestDeleteAction.class);
+ registerRestHandler(handlers, org.elasticsearch.rest.action.count.RestCountAction.class);
+ registerRestHandler(handlers, RestSuggestAction.class);
+ registerRestHandler(handlers, RestTermVectorsAction.class);
+ registerRestHandler(handlers, RestMultiTermVectorsAction.class);
+ registerRestHandler(handlers, RestBulkAction.class);
+ registerRestHandler(handlers, RestUpdateAction.class);
+
+ registerRestHandler(handlers, RestSearchAction.class);
+ registerRestHandler(handlers, RestSearchScrollAction.class);
+ registerRestHandler(handlers, RestClearScrollAction.class);
+ registerRestHandler(handlers, RestMultiSearchAction.class);
+
+ registerRestHandler(handlers, RestValidateQueryAction.class);
+
+ registerRestHandler(handlers, RestExplainAction.class);
+
+ registerRestHandler(handlers, RestRecoveryAction.class);
+
+ // Scripts API
+ registerRestHandler(handlers, RestGetStoredScriptAction.class);
+ registerRestHandler(handlers, RestPutStoredScriptAction.class);
+ registerRestHandler(handlers, RestDeleteStoredScriptAction.class);
+
+ registerRestHandler(handlers, RestFieldStatsAction.class);
+
+ // Tasks API
+ registerRestHandler(handlers, RestListTasksAction.class);
+ registerRestHandler(handlers, RestGetTaskAction.class);
+ registerRestHandler(handlers, RestCancelTasksAction.class);
+
+ // Ingest API
+ registerRestHandler(handlers, RestPutPipelineAction.class);
+ registerRestHandler(handlers, RestGetPipelineAction.class);
+ registerRestHandler(handlers, RestDeletePipelineAction.class);
+ registerRestHandler(handlers, RestSimulatePipelineAction.class);
+
+ // CAT API
+ registerRestHandler(handlers, RestCatAction.class);
+ registerRestHandler(handlers, RestAllocationAction.class);
+ registerRestHandler(handlers, RestShardsAction.class);
+ registerRestHandler(handlers, RestMasterAction.class);
+ registerRestHandler(handlers, RestNodesAction.class);
+ registerRestHandler(handlers, RestTasksAction.class);
+ registerRestHandler(handlers, RestIndicesAction.class);
+ registerRestHandler(handlers, RestSegmentsAction.class);
+ // Fully qualified to prevent interference with rest.action.count.RestCountAction
+ registerRestHandler(handlers, org.elasticsearch.rest.action.cat.RestCountAction.class);
+ // Fully qualified to prevent interference with rest.action.indices.RestRecoveryAction
+ registerRestHandler(handlers, org.elasticsearch.rest.action.cat.RestRecoveryAction.class);
+ registerRestHandler(handlers, RestHealthAction.class);
+ registerRestHandler(handlers, org.elasticsearch.rest.action.cat.RestPendingClusterTasksAction.class);
+ registerRestHandler(handlers, RestAliasAction.class);
+ registerRestHandler(handlers, RestThreadPoolAction.class);
+ registerRestHandler(handlers, RestPluginsAction.class);
+ registerRestHandler(handlers, RestFielddataAction.class);
+ registerRestHandler(handlers, RestNodeAttrsAction.class);
+ registerRestHandler(handlers, RestRepositoriesAction.class);
+ registerRestHandler(handlers, RestSnapshotAction.class);
+ for (ActionPlugin plugin : actionPlugins) {
+ for (Class handler : plugin.getRestHandlers()) {
+ registerRestHandler(handlers, handler);
+ }
+ }
+ return handlers;
}
- public ActionModule registerFilter(Class actionFilter) {
- actionFilters.add(actionFilter);
- return this;
+ private static void registerRestHandler(Set> handlers, Class handler) {
+ if (handlers.contains(handler)) {
+ throw new IllegalArgumentException("can't register the same [rest_handler] more than once for [" + handler.getName() + "]");
+ }
+ handlers.add(handler);
}
@Override
protected void configure() {
- if (proxy == false) {
- if (ingestEnabled) {
- registerFilter(IngestActionFilter.class);
- } else {
- registerFilter(IngestProxyActionFilter.class);
- }
- }
-
Multibinder actionFilterMultibinder = Multibinder.newSetBinder(binder(), ActionFilter.class);
for (Class actionFilter : actionFilters) {
actionFilterMultibinder.addBinding().to(actionFilter);
}
bind(ActionFilters.class).asEagerSingleton();
- bind(AutoCreateIndex.class).asEagerSingleton();
- bind(DestructiveOperations.class).asEagerSingleton();
- registerAction(MainAction.INSTANCE, TransportMainAction.class);
- registerAction(NodesInfoAction.INSTANCE, TransportNodesInfoAction.class);
- registerAction(NodesStatsAction.INSTANCE, TransportNodesStatsAction.class);
- registerAction(NodesHotThreadsAction.INSTANCE, TransportNodesHotThreadsAction.class);
- registerAction(ListTasksAction.INSTANCE, TransportListTasksAction.class);
- registerAction(CancelTasksAction.INSTANCE, TransportCancelTasksAction.class);
+ bind(DestructiveOperations.class).toInstance(destructiveOperations);
- registerAction(ClusterAllocationExplainAction.INSTANCE, TransportClusterAllocationExplainAction.class);
- registerAction(ClusterStatsAction.INSTANCE, TransportClusterStatsAction.class);
- registerAction(ClusterStateAction.INSTANCE, TransportClusterStateAction.class);
- registerAction(ClusterHealthAction.INSTANCE, TransportClusterHealthAction.class);
- registerAction(ClusterUpdateSettingsAction.INSTANCE, TransportClusterUpdateSettingsAction.class);
- registerAction(ClusterRerouteAction.INSTANCE, TransportClusterRerouteAction.class);
- registerAction(ClusterSearchShardsAction.INSTANCE, TransportClusterSearchShardsAction.class);
- registerAction(PendingClusterTasksAction.INSTANCE, TransportPendingClusterTasksAction.class);
- registerAction(PutRepositoryAction.INSTANCE, TransportPutRepositoryAction.class);
- registerAction(GetRepositoriesAction.INSTANCE, TransportGetRepositoriesAction.class);
- registerAction(DeleteRepositoryAction.INSTANCE, TransportDeleteRepositoryAction.class);
- registerAction(VerifyRepositoryAction.INSTANCE, TransportVerifyRepositoryAction.class);
- registerAction(GetSnapshotsAction.INSTANCE, TransportGetSnapshotsAction.class);
- registerAction(DeleteSnapshotAction.INSTANCE, TransportDeleteSnapshotAction.class);
- registerAction(CreateSnapshotAction.INSTANCE, TransportCreateSnapshotAction.class);
- registerAction(RestoreSnapshotAction.INSTANCE, TransportRestoreSnapshotAction.class);
- registerAction(SnapshotsStatusAction.INSTANCE, TransportSnapshotsStatusAction.class);
-
- registerAction(IndicesStatsAction.INSTANCE, TransportIndicesStatsAction.class);
- registerAction(IndicesSegmentsAction.INSTANCE, TransportIndicesSegmentsAction.class);
- registerAction(IndicesShardStoresAction.INSTANCE, TransportIndicesShardStoresAction.class);
- registerAction(CreateIndexAction.INSTANCE, TransportCreateIndexAction.class);
- registerAction(DeleteIndexAction.INSTANCE, TransportDeleteIndexAction.class);
- registerAction(GetIndexAction.INSTANCE, TransportGetIndexAction.class);
- registerAction(OpenIndexAction.INSTANCE, TransportOpenIndexAction.class);
- registerAction(CloseIndexAction.INSTANCE, TransportCloseIndexAction.class);
- registerAction(IndicesExistsAction.INSTANCE, TransportIndicesExistsAction.class);
- registerAction(TypesExistsAction.INSTANCE, TransportTypesExistsAction.class);
- registerAction(GetMappingsAction.INSTANCE, TransportGetMappingsAction.class);
- registerAction(GetFieldMappingsAction.INSTANCE, TransportGetFieldMappingsAction.class, TransportGetFieldMappingsIndexAction.class);
- registerAction(PutMappingAction.INSTANCE, TransportPutMappingAction.class);
- registerAction(IndicesAliasesAction.INSTANCE, TransportIndicesAliasesAction.class);
- registerAction(UpdateSettingsAction.INSTANCE, TransportUpdateSettingsAction.class);
- registerAction(AnalyzeAction.INSTANCE, TransportAnalyzeAction.class);
- registerAction(PutIndexTemplateAction.INSTANCE, TransportPutIndexTemplateAction.class);
- registerAction(GetIndexTemplatesAction.INSTANCE, TransportGetIndexTemplatesAction.class);
- registerAction(DeleteIndexTemplateAction.INSTANCE, TransportDeleteIndexTemplateAction.class);
- registerAction(ValidateQueryAction.INSTANCE, TransportValidateQueryAction.class);
- registerAction(RefreshAction.INSTANCE, TransportRefreshAction.class);
- registerAction(FlushAction.INSTANCE, TransportFlushAction.class);
- registerAction(SyncedFlushAction.INSTANCE, TransportSyncedFlushAction.class);
- registerAction(ForceMergeAction.INSTANCE, TransportForceMergeAction.class);
- registerAction(UpgradeAction.INSTANCE, TransportUpgradeAction.class);
- registerAction(UpgradeStatusAction.INSTANCE, TransportUpgradeStatusAction.class);
- registerAction(UpgradeSettingsAction.INSTANCE, TransportUpgradeSettingsAction.class);
- registerAction(ClearIndicesCacheAction.INSTANCE, TransportClearIndicesCacheAction.class);
- registerAction(GetAliasesAction.INSTANCE, TransportGetAliasesAction.class);
- registerAction(AliasesExistAction.INSTANCE, TransportAliasesExistAction.class);
- registerAction(GetSettingsAction.INSTANCE, TransportGetSettingsAction.class);
-
- registerAction(IndexAction.INSTANCE, TransportIndexAction.class);
- registerAction(GetAction.INSTANCE, TransportGetAction.class);
- registerAction(TermVectorsAction.INSTANCE, TransportTermVectorsAction.class);
- registerAction(MultiTermVectorsAction.INSTANCE, TransportMultiTermVectorsAction.class,
- TransportShardMultiTermsVectorAction.class);
- registerAction(DeleteAction.INSTANCE, TransportDeleteAction.class);
- registerAction(UpdateAction.INSTANCE, TransportUpdateAction.class);
- registerAction(MultiGetAction.INSTANCE, TransportMultiGetAction.class,
- TransportShardMultiGetAction.class);
- registerAction(BulkAction.INSTANCE, TransportBulkAction.class,
- TransportShardBulkAction.class);
- registerAction(SearchAction.INSTANCE, TransportSearchAction.class);
- registerAction(SearchScrollAction.INSTANCE, TransportSearchScrollAction.class);
- registerAction(MultiSearchAction.INSTANCE, TransportMultiSearchAction.class);
- registerAction(PercolateAction.INSTANCE, TransportPercolateAction.class);
- registerAction(MultiPercolateAction.INSTANCE, TransportMultiPercolateAction.class);
- registerAction(ExplainAction.INSTANCE, TransportExplainAction.class);
- registerAction(ClearScrollAction.INSTANCE, TransportClearScrollAction.class);
- registerAction(RecoveryAction.INSTANCE, TransportRecoveryAction.class);
- registerAction(RenderSearchTemplateAction.INSTANCE, TransportRenderSearchTemplateAction.class);
-
- //Indexed scripts
- registerAction(PutStoredScriptAction.INSTANCE, TransportPutStoredScriptAction.class);
- registerAction(GetStoredScriptAction.INSTANCE, TransportGetStoredScriptAction.class);
- registerAction(DeleteStoredScriptAction.INSTANCE, TransportDeleteStoredScriptAction.class);
-
- registerAction(FieldStatsAction.INSTANCE, TransportFieldStatsTransportAction.class);
-
- registerAction(PutPipelineAction.INSTANCE, PutPipelineTransportAction.class);
- registerAction(GetPipelineAction.INSTANCE, GetPipelineTransportAction.class);
- registerAction(DeletePipelineAction.INSTANCE, DeletePipelineTransportAction.class);
- registerAction(SimulatePipelineAction.INSTANCE, SimulatePipelineTransportAction.class);
-
- // register Name -> GenericAction Map that can be injected to instances.
- MapBinder actionsBinder
- = MapBinder.newMapBinder(binder(), String.class, GenericAction.class);
-
- for (Map.Entry entry : actions.entrySet()) {
- actionsBinder.addBinding(entry.getKey()).toInstance(entry.getValue().action);
- }
- // register GenericAction -> transportAction Map that can be injected to instances.
- // also register any supporting classes
- if (!proxy) {
+ if (false == transportClient) {
+ // Supporting classes only used when not a transport client
+ bind(AutoCreateIndex.class).toInstance(autoCreateIndex);
bind(TransportLivenessAction.class).asEagerSingleton();
+
+ // register GenericAction -> transportAction Map used by NodeClient
+ @SuppressWarnings("rawtypes")
MapBinder transportActionsBinder
= MapBinder.newMapBinder(binder(), GenericAction.class, TransportAction.class);
- for (Map.Entry entry : actions.entrySet()) {
+ for (ActionHandler action : actions.values()) {
// bind the action as eager singleton, so the map binder one will reuse it
- bind(entry.getValue().transportAction).asEagerSingleton();
- transportActionsBinder.addBinding(entry.getValue().action).to(entry.getValue().transportAction).asEagerSingleton();
- for (Class supportAction : entry.getValue().supportTransportActions) {
+ bind(action.getTransportAction()).asEagerSingleton();
+ transportActionsBinder.addBinding(action.getAction()).to(action.getTransportAction()).asEagerSingleton();
+ for (Class supportAction : action.getSupportTransportActions()) {
bind(supportAction).asEagerSingleton();
}
}
+
+ // Bind the RestController which is required (by Node) even if rest isn't enabled.
+ bind(RestController.class).toInstance(restController);
+
+ // Setup the RestHandlers
+ if (NetworkModule.HTTP_ENABLED.get(settings)) {
+ Multibinder restHandlers = Multibinder.newSetBinder(binder(), RestHandler.class);
+ Multibinder catHandlers = Multibinder.newSetBinder(binder(), AbstractCatAction.class);
+ for (Class handler : setupRestHandlers(actionPlugins)) {
+ bind(handler).asEagerSingleton();
+ if (AbstractCatAction.class.isAssignableFrom(handler)) {
+ catHandlers.addBinding().to(handler.asSubclass(AbstractCatAction.class));
+ } else {
+ restHandlers.addBinding().to(handler);
+ }
+ }
+ }
}
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/ActionRequest.java b/core/src/main/java/org/elasticsearch/action/ActionRequest.java
index 7955855bc0d..bc052895a6f 100644
--- a/core/src/main/java/org/elasticsearch/action/ActionRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/ActionRequest.java
@@ -39,6 +39,13 @@ public abstract class ActionRequest> exte
public abstract ActionRequestValidationException validate();
+ /**
+ * Should this task persist its result after it has finished?
+ */
+ public boolean getShouldPersistResult() {
+ return false;
+ }
+
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
diff --git a/core/src/main/java/org/elasticsearch/action/ActionRunnable.java b/core/src/main/java/org/elasticsearch/action/ActionRunnable.java
index 36c3f4f17fa..78e2249d6f4 100644
--- a/core/src/main/java/org/elasticsearch/action/ActionRunnable.java
+++ b/core/src/main/java/org/elasticsearch/action/ActionRunnable.java
@@ -22,11 +22,11 @@ package org.elasticsearch.action;
import org.elasticsearch.common.util.concurrent.AbstractRunnable;
/**
- * Base class for {@link Runnable}s that need to call {@link ActionListener#onFailure(Throwable)} in case an uncaught
+ * Base class for {@link Runnable}s that need to call {@link ActionListener#onFailure(Exception)} in case an uncaught
* exception or error is thrown while the actual action is run.
*/
public abstract class ActionRunnable extends AbstractRunnable {
-
+
protected final ActionListener listener;
public ActionRunnable(ActionListener listener) {
@@ -34,11 +34,11 @@ public abstract class ActionRunnable extends AbstractRunnable {
}
/**
- * Calls the action listeners {@link ActionListener#onFailure(Throwable)} method with the given exception.
+ * Calls the action listeners {@link ActionListener#onFailure(Exception)} method with the given exception.
* This method is invoked for all exception thrown by {@link #doRun()}
*/
@Override
- public void onFailure(Throwable t) {
- listener.onFailure(t);
+ public void onFailure(Exception e) {
+ listener.onFailure(e);
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/DocWriteResponse.java b/core/src/main/java/org/elasticsearch/action/DocWriteResponse.java
index 4df43b75401..0925c744144 100644
--- a/core/src/main/java/org/elasticsearch/action/DocWriteResponse.java
+++ b/core/src/main/java/org/elasticsearch/action/DocWriteResponse.java
@@ -18,10 +18,15 @@
*/
package org.elasticsearch.action;
+import org.elasticsearch.action.support.WriteRequest;
+import org.elasticsearch.action.support.WriteResponse;
+import org.elasticsearch.action.support.WriteRequest.RefreshPolicy;
+import org.elasticsearch.action.support.replication.ReplicationResponse;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.StatusToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.index.IndexSettings;
import org.elasticsearch.index.shard.ShardId;
import org.elasticsearch.rest.RestStatus;
@@ -30,12 +35,13 @@ import java.io.IOException;
/**
* A base class for the response of a write operation that involves a single doc
*/
-public abstract class DocWriteResponse extends ReplicationResponse implements StatusToXContent {
+public abstract class DocWriteResponse extends ReplicationResponse implements WriteResponse, StatusToXContent {
private ShardId shardId;
private String id;
private String type;
private long version;
+ private boolean forcedRefresh;
public DocWriteResponse(ShardId shardId, String type, String id, long version) {
this.shardId = shardId;
@@ -84,6 +90,20 @@ public abstract class DocWriteResponse extends ReplicationResponse implements St
return this.version;
}
+ /**
+ * Did this request force a refresh? Requests that set {@link WriteRequest#setRefreshPolicy(RefreshPolicy)} to
+ * {@link RefreshPolicy#IMMEDIATE} will always return true for this. Requests that set it to {@link RefreshPolicy#WAIT_UNTIL} will
+ * only return true here if they run out of refresh listener slots (see {@link IndexSettings#MAX_REFRESH_LISTENERS_PER_SHARD}).
+ */
+ public boolean forcedRefresh() {
+ return forcedRefresh;
+ }
+
+ @Override
+ public void setForcedRefresh(boolean forcedRefresh) {
+ this.forcedRefresh = forcedRefresh;
+ }
+
/** returns the rest status for this response (based on {@link ShardInfo#status()} */
public RestStatus status() {
return getShardInfo().status();
@@ -97,6 +117,7 @@ public abstract class DocWriteResponse extends ReplicationResponse implements St
type = in.readString();
id = in.readString();
version = in.readZLong();
+ forcedRefresh = in.readBoolean();
}
@Override
@@ -106,6 +127,7 @@ public abstract class DocWriteResponse extends ReplicationResponse implements St
out.writeString(type);
out.writeString(id);
out.writeZLong(version);
+ out.writeBoolean(forcedRefresh);
}
static final class Fields {
@@ -121,7 +143,8 @@ public abstract class DocWriteResponse extends ReplicationResponse implements St
builder.field(Fields._INDEX, shardId.getIndexName())
.field(Fields._TYPE, type)
.field(Fields._ID, id)
- .field(Fields._VERSION, version);
+ .field(Fields._VERSION, version)
+ .field("forced_refresh", forcedRefresh);
shardInfo.toXContent(builder, params);
return builder;
}
diff --git a/core/src/main/java/org/elasticsearch/action/IndicesRequest.java b/core/src/main/java/org/elasticsearch/action/IndicesRequest.java
index 4c62a7e849b..3ef699818b6 100644
--- a/core/src/main/java/org/elasticsearch/action/IndicesRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/IndicesRequest.java
@@ -40,7 +40,7 @@ public interface IndicesRequest {
*/
IndicesOptions indicesOptions();
- static interface Replaceable extends IndicesRequest {
+ interface Replaceable extends IndicesRequest {
/**
* Sets the indices that the action relates to.
*/
diff --git a/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java b/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java
index fb0fd81a7be..e5e0af93072 100644
--- a/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java
+++ b/core/src/main/java/org/elasticsearch/action/LatchedActionListener.java
@@ -45,7 +45,7 @@ public class LatchedActionListener implements ActionListener {
}
@Override
- public void onFailure(Throwable e) {
+ public void onFailure(Exception e) {
try {
delegate.onFailure(e);
} finally {
diff --git a/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java b/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java
index 67436f31772..6704f610ec0 100644
--- a/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java
+++ b/core/src/main/java/org/elasticsearch/action/TaskOperationFailure.java
@@ -43,15 +43,15 @@ public final class TaskOperationFailure implements Writeable, ToXContent {
private final long taskId;
- private final Throwable reason;
+ private final Exception reason;
private final RestStatus status;
- public TaskOperationFailure(String nodeId, long taskId, Throwable t) {
+ public TaskOperationFailure(String nodeId, long taskId, Exception e) {
this.nodeId = nodeId;
this.taskId = taskId;
- this.reason = t;
- status = ExceptionsHelper.status(t);
+ this.reason = e;
+ status = ExceptionsHelper.status(e);
}
/**
@@ -60,7 +60,7 @@ public final class TaskOperationFailure implements Writeable, ToXContent {
public TaskOperationFailure(StreamInput in) throws IOException {
nodeId = in.readString();
taskId = in.readLong();
- reason = in.readThrowable();
+ reason = in.readException();
status = RestStatus.readFrom(in);
}
@@ -68,7 +68,7 @@ public final class TaskOperationFailure implements Writeable, ToXContent {
public void writeTo(StreamOutput out) throws IOException {
out.writeString(nodeId);
out.writeLong(taskId);
- out.writeThrowable(reason);
+ out.writeException(reason);
RestStatus.writeTo(out, status);
}
diff --git a/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java b/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java
index b12af818c2e..7d57e5bd60a 100644
--- a/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java
+++ b/core/src/main/java/org/elasticsearch/action/TransportActionNodeProxy.java
@@ -35,7 +35,6 @@ public class TransportActionNodeProxy action;
private final TransportRequestOptions transportOptions;
- @Inject
public TransportActionNodeProxy(Settings settings, GenericAction action, TransportService transportService) {
super(settings);
this.action = action;
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java
index dbabe681c7a..e007929faf2 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/ClusterAllocationExplanation.java
@@ -42,17 +42,22 @@ public final class ClusterAllocationExplanation implements ToXContent, Writeable
private final ShardId shard;
private final boolean primary;
+ private final boolean hasPendingAsyncFetch;
private final String assignedNodeId;
private final UnassignedInfo unassignedInfo;
+ private final long allocationDelayMillis;
private final long remainingDelayMillis;
private final Map nodeExplanations;
- public ClusterAllocationExplanation(ShardId shard, boolean primary, @Nullable String assignedNodeId, long remainingDelayMillis,
- @Nullable UnassignedInfo unassignedInfo, Map nodeExplanations) {
+ public ClusterAllocationExplanation(ShardId shard, boolean primary, @Nullable String assignedNodeId, long allocationDelayMillis,
+ long remainingDelayMillis, @Nullable UnassignedInfo unassignedInfo, boolean hasPendingAsyncFetch,
+ Map nodeExplanations) {
this.shard = shard;
this.primary = primary;
+ this.hasPendingAsyncFetch = hasPendingAsyncFetch;
this.assignedNodeId = assignedNodeId;
this.unassignedInfo = unassignedInfo;
+ this.allocationDelayMillis = allocationDelayMillis;
this.remainingDelayMillis = remainingDelayMillis;
this.nodeExplanations = nodeExplanations;
}
@@ -60,8 +65,10 @@ public final class ClusterAllocationExplanation implements ToXContent, Writeable
public ClusterAllocationExplanation(StreamInput in) throws IOException {
this.shard = ShardId.readShardId(in);
this.primary = in.readBoolean();
+ this.hasPendingAsyncFetch = in.readBoolean();
this.assignedNodeId = in.readOptionalString();
this.unassignedInfo = in.readOptionalWriteable(UnassignedInfo::new);
+ this.allocationDelayMillis = in.readVLong();
this.remainingDelayMillis = in.readVLong();
int mapSize = in.readVInt();
@@ -77,8 +84,10 @@ public final class ClusterAllocationExplanation implements ToXContent, Writeable
public void writeTo(StreamOutput out) throws IOException {
this.getShard().writeTo(out);
out.writeBoolean(this.isPrimary());
+ out.writeBoolean(this.isStillFetchingShardData());
out.writeOptionalString(this.getAssignedNodeId());
out.writeOptionalWriteable(this.getUnassignedInfo());
+ out.writeVLong(allocationDelayMillis);
out.writeVLong(remainingDelayMillis);
out.writeVInt(this.nodeExplanations.size());
@@ -97,6 +106,11 @@ public final class ClusterAllocationExplanation implements ToXContent, Writeable
return this.primary;
}
+ /** Return turn if shard data is still being fetched for the allocation */
+ public boolean isStillFetchingShardData() {
+ return this.hasPendingAsyncFetch;
+ }
+
/** Return turn if the shard is assigned to a node */
public boolean isAssigned() {
return this.assignedNodeId != null;
@@ -114,7 +128,12 @@ public final class ClusterAllocationExplanation implements ToXContent, Writeable
return this.unassignedInfo;
}
- /** Return the remaining allocation delay for this shard in millisocends */
+ /** Return the configured delay before the shard can be allocated in milliseconds */
+ public long getAllocationDelayMillis() {
+ return this.allocationDelayMillis;
+ }
+
+ /** Return the remaining allocation delay for this shard in milliseconds */
public long getRemainingDelayMillis() {
return this.remainingDelayMillis;
}
@@ -138,11 +157,11 @@ public final class ClusterAllocationExplanation implements ToXContent, Writeable
if (assignedNodeId != null) {
builder.field("assigned_node_id", this.assignedNodeId);
}
+ builder.field("shard_state_fetch_pending", this.hasPendingAsyncFetch);
// If we have unassigned info, show that
if (unassignedInfo != null) {
unassignedInfo.toXContent(builder, params);
- long delay = unassignedInfo.getLastComputedLeftDelayNanos();
- builder.timeValueField("allocation_delay_in_millis", "allocation_delay", TimeValue.timeValueNanos(delay));
+ builder.timeValueField("allocation_delay_in_millis", "allocation_delay", TimeValue.timeValueMillis(allocationDelayMillis));
builder.timeValueField("remaining_delay_in_millis", "remaining_delay", TimeValue.timeValueMillis(remainingDelayMillis));
}
builder.startObject("nodes");
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java
index 8f467402bc4..e564711d418 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/NodeExplanation.java
@@ -43,7 +43,7 @@ public class NodeExplanation implements Writeable, ToXContent {
private final String finalExplanation;
public NodeExplanation(final DiscoveryNode node, final Decision nodeDecision, final Float nodeWeight,
- final @Nullable IndicesShardStoresResponse.StoreStatus storeStatus,
+ @Nullable final IndicesShardStoresResponse.StoreStatus storeStatus,
final ClusterAllocationExplanation.FinalDecision finalDecision,
final String finalExplanation,
final ClusterAllocationExplanation.StoreCopy storeCopy) {
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java
index 08e899be4df..d63a7ff8968 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/allocation/TransportClusterAllocationExplainAction.java
@@ -19,7 +19,6 @@
package org.elasticsearch.action.admin.cluster.allocation;
-import com.carrotsearch.hppc.cursors.ObjectObjectCursor;
import org.apache.lucene.index.CorruptIndexException;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.ExceptionsHelper;
@@ -30,24 +29,18 @@ import org.elasticsearch.action.admin.indices.shards.TransportIndicesShardStores
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.master.TransportMasterNodeAction;
import org.elasticsearch.cluster.ClusterInfoService;
-import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.block.ClusterBlockException;
import org.elasticsearch.cluster.block.ClusterBlockLevel;
import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.metadata.MetaData;
-import org.elasticsearch.cluster.metadata.MetaData.Custom;
import org.elasticsearch.cluster.node.DiscoveryNode;
import org.elasticsearch.cluster.routing.RoutingNode;
import org.elasticsearch.cluster.routing.RoutingNodes;
-import org.elasticsearch.cluster.routing.RoutingNodes.RoutingNodesIterator;
-import org.elasticsearch.cluster.routing.RoutingTable;
import org.elasticsearch.cluster.routing.ShardRouting;
import org.elasticsearch.cluster.routing.UnassignedInfo;
-import org.elasticsearch.cluster.routing.allocation.AllocationService;
import org.elasticsearch.cluster.routing.allocation.RoutingAllocation;
-import org.elasticsearch.cluster.routing.allocation.RoutingExplanations;
import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;
import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
import org.elasticsearch.cluster.routing.allocation.decider.Decision;
@@ -56,15 +49,17 @@ import org.elasticsearch.common.collect.ImmutableOpenIntMap;
import org.elasticsearch.common.inject.Inject;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.gateway.GatewayAllocator;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import static org.elasticsearch.cluster.routing.UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING;
+
/**
* The {@code TransportClusterAllocationExplainAction} is responsible for actually executing the explanation of a shard's allocation on the
* master node in the cluster.
@@ -72,26 +67,26 @@ import java.util.Set;
public class TransportClusterAllocationExplainAction
extends TransportMasterNodeAction {
- private final AllocationService allocationService;
private final ClusterInfoService clusterInfoService;
private final AllocationDeciders allocationDeciders;
private final ShardsAllocator shardAllocator;
private final TransportIndicesShardStoresAction shardStoresAction;
+ private final GatewayAllocator gatewayAllocator;
@Inject
public TransportClusterAllocationExplainAction(Settings settings, TransportService transportService, ClusterService clusterService,
ThreadPool threadPool, ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver,
- AllocationService allocationService, ClusterInfoService clusterInfoService,
- AllocationDeciders allocationDeciders, ShardsAllocator shardAllocator,
- TransportIndicesShardStoresAction shardStoresAction) {
+ ClusterInfoService clusterInfoService, AllocationDeciders allocationDeciders,
+ ShardsAllocator shardAllocator, TransportIndicesShardStoresAction shardStoresAction,
+ GatewayAllocator gatewayAllocator) {
super(settings, ClusterAllocationExplainAction.NAME, transportService, clusterService, threadPool, actionFilters,
indexNameExpressionResolver, ClusterAllocationExplainRequest::new);
- this.allocationService = allocationService;
this.clusterInfoService = clusterInfoService;
this.allocationDeciders = allocationDeciders;
this.shardAllocator = shardAllocator;
this.shardStoresAction = shardStoresAction;
+ this.gatewayAllocator = gatewayAllocator;
}
@Override
@@ -140,7 +135,8 @@ public class TransportClusterAllocationExplainAction
Float nodeWeight,
IndicesShardStoresResponse.StoreStatus storeStatus,
String assignedNodeId,
- Set activeAllocationIds) {
+ Set activeAllocationIds,
+ boolean hasPendingAsyncFetch) {
final ClusterAllocationExplanation.FinalDecision finalDecision;
final ClusterAllocationExplanation.StoreCopy storeCopy;
final String finalExplanation;
@@ -149,7 +145,7 @@ public class TransportClusterAllocationExplainAction
// No copies of the data
storeCopy = ClusterAllocationExplanation.StoreCopy.NONE;
} else {
- final Throwable storeErr = storeStatus.getStoreException();
+ final Exception storeErr = storeStatus.getStoreException();
if (storeErr != null) {
if (ExceptionsHelper.unwrapCause(storeErr) instanceof CorruptIndexException) {
storeCopy = ClusterAllocationExplanation.StoreCopy.CORRUPT;
@@ -171,6 +167,19 @@ public class TransportClusterAllocationExplainAction
if (node.getId().equals(assignedNodeId)) {
finalDecision = ClusterAllocationExplanation.FinalDecision.ALREADY_ASSIGNED;
finalExplanation = "the shard is already assigned to this node";
+ } else if (hasPendingAsyncFetch &&
+ shard.primary() == false &&
+ shard.unassigned() &&
+ shard.allocatedPostIndexCreate(indexMetaData) &&
+ nodeDecision.type() != Decision.Type.YES) {
+ finalExplanation = "the shard cannot be assigned because allocation deciders return a " + nodeDecision.type().name() +
+ " decision and the shard's state is still being fetched";
+ finalDecision = ClusterAllocationExplanation.FinalDecision.NO;
+ } else if (hasPendingAsyncFetch &&
+ shard.unassigned() &&
+ shard.allocatedPostIndexCreate(indexMetaData)) {
+ finalExplanation = "the shard's state is still being fetched so it cannot be allocated";
+ finalDecision = ClusterAllocationExplanation.FinalDecision.NO;
} else if (shard.primary() && shard.unassigned() && shard.allocatedPostIndexCreate(indexMetaData) &&
storeCopy == ClusterAllocationExplanation.StoreCopy.STALE) {
finalExplanation = "the copy of the shard is stale, allocation ids do not match";
@@ -190,6 +199,7 @@ public class TransportClusterAllocationExplainAction
finalDecision = ClusterAllocationExplanation.FinalDecision.NO;
finalExplanation = "the shard cannot be assigned because one or more allocation decider returns a 'NO' decision";
} else {
+ // TODO: handle throttling decision better here
finalDecision = ClusterAllocationExplanation.FinalDecision.YES;
if (storeCopy == ClusterAllocationExplanation.StoreCopy.AVAILABLE) {
finalExplanation = "the shard can be assigned and the node contains a valid copy of the shard data";
@@ -208,16 +218,15 @@ public class TransportClusterAllocationExplainAction
*/
public static ClusterAllocationExplanation explainShard(ShardRouting shard, RoutingAllocation allocation, RoutingNodes routingNodes,
boolean includeYesDecisions, ShardsAllocator shardAllocator,
- List shardStores) {
+ List shardStores,
+ GatewayAllocator gatewayAllocator) {
// don't short circuit deciders, we want a full explanation
allocation.debugDecision(true);
// get the existing unassigned info if available
UnassignedInfo ui = shard.unassignedInfo();
- RoutingNodesIterator iter = routingNodes.nodes();
Map nodeToDecision = new HashMap<>();
- while (iter.hasNext()) {
- RoutingNode node = iter.next();
+ for (RoutingNode node : routingNodes) {
DiscoveryNode discoNode = node.node();
if (discoNode.isDataNode()) {
Decision d = tryShardOnNode(shard, node, allocation, includeYesDecisions);
@@ -227,9 +236,9 @@ public class TransportClusterAllocationExplainAction
long remainingDelayMillis = 0;
final MetaData metadata = allocation.metaData();
final IndexMetaData indexMetaData = metadata.index(shard.index());
- if (ui != null) {
- final Settings indexSettings = indexMetaData.getSettings();
- long remainingDelayNanos = ui.getRemainingDelay(System.nanoTime(), metadata.settings(), indexSettings);
+ long allocationDelayMillis = INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.get(indexMetaData.getSettings()).getMillis();
+ if (ui != null && ui.isDelayed()) {
+ long remainingDelayNanos = ui.getRemainingDelay(System.nanoTime(), indexMetaData.getSettings());
remainingDelayMillis = TimeValue.timeValueNanos(remainingDelayNanos).millis();
}
@@ -248,19 +257,21 @@ public class TransportClusterAllocationExplainAction
Float weight = weights.get(node);
IndicesShardStoresResponse.StoreStatus storeStatus = nodeToStatus.get(node);
NodeExplanation nodeExplanation = calculateNodeExplanation(shard, indexMetaData, node, decision, weight,
- storeStatus, shard.currentNodeId(), indexMetaData.activeAllocationIds(shard.getId()));
+ storeStatus, shard.currentNodeId(), indexMetaData.activeAllocationIds(shard.getId()),
+ allocation.hasPendingAsyncFetch());
explanations.put(node, nodeExplanation);
}
return new ClusterAllocationExplanation(shard.shardId(), shard.primary(),
- shard.currentNodeId(), remainingDelayMillis, ui, explanations);
+ shard.currentNodeId(), allocationDelayMillis, remainingDelayMillis, ui,
+ gatewayAllocator.hasFetchPending(shard.shardId(), shard.primary()), explanations);
}
@Override
protected void masterOperation(final ClusterAllocationExplainRequest request, final ClusterState state,
final ActionListener listener) {
final RoutingNodes routingNodes = state.getRoutingNodes();
- final RoutingAllocation allocation = new RoutingAllocation(allocationDeciders, routingNodes, state.nodes(),
- clusterInfoService.getClusterInfo(), System.nanoTime());
+ final RoutingAllocation allocation = new RoutingAllocation(allocationDeciders, routingNodes, state,
+ clusterInfoService.getClusterInfo(), System.nanoTime(), false);
ShardRouting foundShard = null;
if (request.useAnyUnassignedShard()) {
@@ -307,12 +318,12 @@ public class TransportClusterAllocationExplainAction
shardStoreResponse.getStoreStatuses().get(shardRouting.getIndexName());
List shardStoreStatus = shardStatuses.get(shardRouting.id());
ClusterAllocationExplanation cae = explainShard(shardRouting, allocation, routingNodes,
- request.includeYesDecisions(), shardAllocator, shardStoreStatus);
+ request.includeYesDecisions(), shardAllocator, shardStoreStatus, gatewayAllocator);
listener.onResponse(new ClusterAllocationExplainResponse(cae));
}
@Override
- public void onFailure(Throwable e) {
+ public void onFailure(Exception e) {
listener.onFailure(e);
}
});
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
index 59b426d8c31..27970f332fc 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/health/ClusterHealthRequest.java
@@ -33,8 +33,6 @@ import org.elasticsearch.common.unit.TimeValue;
import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import static org.elasticsearch.common.unit.TimeValue.readTimeValue;
-
/**
*
*/
@@ -160,7 +158,7 @@ public class ClusterHealthRequest extends MasterNodeReadRequest {
- private final ClusterName clusterName;
private final GatewayAllocator gatewayAllocator;
@Inject
public TransportClusterHealthAction(Settings settings, TransportService transportService, ClusterService clusterService,
- ThreadPool threadPool, ClusterName clusterName, ActionFilters actionFilters,
+ ThreadPool threadPool, ActionFilters actionFilters,
IndexNameExpressionResolver indexNameExpressionResolver, GatewayAllocator gatewayAllocator) {
- super(settings, ClusterHealthAction.NAME, transportService, clusterService, threadPool, actionFilters, indexNameExpressionResolver, ClusterHealthRequest::new);
- this.clusterName = clusterName;
+ super(settings, ClusterHealthAction.NAME, false, transportService, clusterService, threadPool, actionFilters,
+ indexNameExpressionResolver, ClusterHealthRequest::new);
this.gatewayAllocator = gatewayAllocator;
}
@@ -106,9 +104,9 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
}
@Override
- public void onFailure(String source, Throwable t) {
- logger.error("unexpected failure during [{}]", t, source);
- listener.onFailure(t);
+ public void onFailure(String source, Exception e) {
+ logger.error("unexpected failure during [{}]", e, source);
+ listener.onFailure(e);
}
@Override
@@ -283,14 +281,14 @@ public class TransportClusterHealthAction extends TransportMasterNodeReadAction<
concreteIndices = indexNameExpressionResolver.concreteIndexNames(clusterState, request);
} catch (IndexNotFoundException e) {
// one of the specified indices is not there - treat it as RED.
- ClusterHealthResponse response = new ClusterHealthResponse(clusterName.value(), Strings.EMPTY_ARRAY, clusterState,
+ ClusterHealthResponse response = new ClusterHealthResponse(clusterState.getClusterName().value(), Strings.EMPTY_ARRAY, clusterState,
numberOfPendingTasks, numberOfInFlightFetch, UnassignedInfo.getNumberOfDelayedUnassigned(clusterState),
pendingTaskTimeInQueue);
response.setStatus(ClusterHealthStatus.RED);
return response;
}
- return new ClusterHealthResponse(clusterName.value(), concreteIndices, clusterState, numberOfPendingTasks,
+ return new ClusterHealthResponse(clusterState.getClusterName().value(), concreteIndices, clusterState, numberOfPendingTasks,
numberOfInFlightFetch, UnassignedInfo.getNumberOfDelayedUnassigned(clusterState), pendingTaskTimeInQueue);
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
index 7c8f797fdcb..e3df7f57312 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/NodesHotThreadsRequest.java
@@ -101,7 +101,7 @@ public class NodesHotThreadsRequest extends BaseNodesRequest {
NodesHotThreadsResponse() {
}
- public NodesHotThreadsResponse(ClusterName clusterName, NodeHotThreads[] nodes) {
- super(clusterName, nodes);
+ public NodesHotThreadsResponse(ClusterName clusterName, List nodes, List failures) {
+ super(clusterName, nodes, failures);
}
@Override
- public void readFrom(StreamInput in) throws IOException {
- super.readFrom(in);
- nodes = new NodeHotThreads[in.readVInt()];
- for (int i = 0; i < nodes.length; i++) {
- nodes[i] = NodeHotThreads.readNodeHotThreads(in);
- }
+ protected List readNodesFrom(StreamInput in) throws IOException {
+ return in.readList(NodeHotThreads::readNodeHotThreads);
}
@Override
- public void writeTo(StreamOutput out) throws IOException {
- super.writeTo(out);
- out.writeVInt(nodes.length);
- for (NodeHotThreads node : nodes) {
- node.writeTo(out);
- }
+ protected void writeNodesTo(StreamOutput out, List nodes) throws IOException {
+ out.writeStreamableList(nodes);
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
index d53f651da45..73403f40318 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/hotthreads/TransportNodesHotThreadsAction.java
@@ -20,6 +20,7 @@
package org.elasticsearch.action.admin.cluster.node.hotthreads;
import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
import org.elasticsearch.action.support.nodes.TransportNodesAction;
@@ -35,33 +36,28 @@ import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicReferenceArray;
/**
*
*/
-public class TransportNodesHotThreadsAction extends TransportNodesAction {
+public class TransportNodesHotThreadsAction extends TransportNodesAction {
@Inject
- public TransportNodesHotThreadsAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
+ public TransportNodesHotThreadsAction(Settings settings, ThreadPool threadPool,
ClusterService clusterService, TransportService transportService,
ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
- super(settings, NodesHotThreadsAction.NAME, clusterName, threadPool, clusterService, transportService, actionFilters,
- indexNameExpressionResolver, NodesHotThreadsRequest::new, NodeRequest::new, ThreadPool.Names.GENERIC);
+ super(settings, NodesHotThreadsAction.NAME, threadPool, clusterService, transportService, actionFilters,
+ indexNameExpressionResolver, NodesHotThreadsRequest::new, NodeRequest::new, ThreadPool.Names.GENERIC, NodeHotThreads.class);
}
@Override
- protected NodesHotThreadsResponse newResponse(NodesHotThreadsRequest request, AtomicReferenceArray responses) {
- final List nodes = new ArrayList<>();
- for (int i = 0; i < responses.length(); i++) {
- Object resp = responses.get(i);
- if (resp instanceof NodeHotThreads) {
- nodes.add((NodeHotThreads) resp);
- }
- }
- return new NodesHotThreadsResponse(clusterName, nodes.toArray(new NodeHotThreads[nodes.size()]));
+ protected NodesHotThreadsResponse newResponse(NodesHotThreadsRequest request,
+ List responses, List failures) {
+ return new NodesHotThreadsResponse(clusterService.getClusterName(), responses, failures);
}
@Override
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
index 87ec2d052ab..d7ce899792f 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java
@@ -27,8 +27,9 @@ import org.elasticsearch.common.Nullable;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.http.HttpInfo;
-import org.elasticsearch.ingest.core.IngestInfo;
+import org.elasticsearch.ingest.IngestInfo;
import org.elasticsearch.monitor.jvm.JvmInfo;
import org.elasticsearch.monitor.os.OsInfo;
import org.elasticsearch.monitor.process.ProcessInfo;
@@ -45,8 +46,6 @@ import static java.util.Collections.unmodifiableMap;
* Node information (static, does not change over time).
*/
public class NodeInfo extends BaseNodeResponse {
- @Nullable
- private Map serviceAttributes;
private Version version;
private Build build;
@@ -78,16 +77,19 @@ public class NodeInfo extends BaseNodeResponse {
@Nullable
private IngestInfo ingest;
+ @Nullable
+ private ByteSizeValue totalIndexingBuffer;
+
public NodeInfo() {
}
- public NodeInfo(Version version, Build build, DiscoveryNode node, @Nullable Map serviceAttributes, @Nullable Settings settings,
+ public NodeInfo(Version version, Build build, DiscoveryNode node, @Nullable Settings settings,
@Nullable OsInfo os, @Nullable ProcessInfo process, @Nullable JvmInfo jvm, @Nullable ThreadPoolInfo threadPool,
- @Nullable TransportInfo transport, @Nullable HttpInfo http, @Nullable PluginsAndModules plugins, @Nullable IngestInfo ingest) {
+ @Nullable TransportInfo transport, @Nullable HttpInfo http, @Nullable PluginsAndModules plugins, @Nullable IngestInfo ingest,
+ @Nullable ByteSizeValue totalIndexingBuffer) {
super(node);
this.version = version;
this.build = build;
- this.serviceAttributes = serviceAttributes;
this.settings = settings;
this.os = os;
this.process = process;
@@ -97,6 +99,7 @@ public class NodeInfo extends BaseNodeResponse {
this.http = http;
this.plugins = plugins;
this.ingest = ingest;
+ this.totalIndexingBuffer = totalIndexingBuffer;
}
/**
@@ -121,14 +124,6 @@ public class NodeInfo extends BaseNodeResponse {
return this.build;
}
- /**
- * The service attributes of the node.
- */
- @Nullable
- public Map getServiceAttributes() {
- return this.serviceAttributes;
- }
-
/**
* The settings of the node.
*/
@@ -186,6 +181,11 @@ public class NodeInfo extends BaseNodeResponse {
return ingest;
}
+ @Nullable
+ public ByteSizeValue getTotalIndexingBuffer() {
+ return totalIndexingBuffer;
+ }
+
public static NodeInfo readNodeInfo(StreamInput in) throws IOException {
NodeInfo nodeInfo = new NodeInfo();
nodeInfo.readFrom(in);
@@ -198,12 +198,9 @@ public class NodeInfo extends BaseNodeResponse {
version = Version.readVersion(in);
build = Build.readBuild(in);
if (in.readBoolean()) {
- Map builder = new HashMap<>();
- int size = in.readVInt();
- for (int i = 0; i < size; i++) {
- builder.put(in.readString(), in.readString());
- }
- serviceAttributes = unmodifiableMap(builder);
+ totalIndexingBuffer = new ByteSizeValue(in.readLong());
+ } else {
+ totalIndexingBuffer = null;
}
if (in.readBoolean()) {
settings = Settings.readSettingsFromStream(in);
@@ -240,15 +237,11 @@ public class NodeInfo extends BaseNodeResponse {
super.writeTo(out);
out.writeVInt(version.id);
Build.writeBuild(build, out);
- if (getServiceAttributes() == null) {
+ if (totalIndexingBuffer == null) {
out.writeBoolean(false);
} else {
out.writeBoolean(true);
- out.writeVInt(serviceAttributes.size());
- for (Map.Entry entry : serviceAttributes.entrySet()) {
- out.writeString(entry.getKey());
- out.writeString(entry.getValue());
- }
+ out.writeLong(totalIndexingBuffer.bytes());
}
if (settings == null) {
out.writeBoolean(false);
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
index 66c5cfd65d4..b547d1d7432 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequest.java
@@ -39,6 +39,7 @@ public class NodesInfoRequest extends BaseNodesRequest {
private boolean http = true;
private boolean plugins = true;
private boolean ingest = true;
+ private boolean indices = true;
public NodesInfoRequest() {
}
@@ -64,6 +65,7 @@ public class NodesInfoRequest extends BaseNodesRequest {
http = false;
plugins = false;
ingest = false;
+ indices = false;
return this;
}
@@ -80,6 +82,7 @@ public class NodesInfoRequest extends BaseNodesRequest {
http = true;
plugins = true;
ingest = true;
+ indices = true;
return this;
}
@@ -221,6 +224,22 @@ public class NodesInfoRequest extends BaseNodesRequest {
return ingest;
}
+ /**
+ * Should information about indices (currently just indexing buffers) be returned
+ * @param indices true if you want info
+ */
+ public NodesInfoRequest indices(boolean indices) {
+ this.indices = indices;
+ return this;
+ }
+
+ /**
+ * @return true if information about indices (currently just indexing buffers)
+ */
+ public boolean indices() {
+ return indices;
+ }
+
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
@@ -233,6 +252,7 @@ public class NodesInfoRequest extends BaseNodesRequest {
http = in.readBoolean();
plugins = in.readBoolean();
ingest = in.readBoolean();
+ indices = in.readBoolean();
}
@Override
@@ -247,5 +267,6 @@ public class NodesInfoRequest extends BaseNodesRequest {
out.writeBoolean(http);
out.writeBoolean(plugins);
out.writeBoolean(ingest);
+ out.writeBoolean(indices);
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
index fc484012379..16befb79aab 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodesInfoRequestBuilder.java
@@ -118,4 +118,12 @@ public class NodesInfoRequestBuilder extends NodesOperationRequestBuilder implements To
public NodesInfoResponse() {
}
- public NodesInfoResponse(ClusterName clusterName, NodeInfo[] nodes) {
- super(clusterName, nodes);
+ public NodesInfoResponse(ClusterName clusterName, List nodes, List failures) {
+ super(clusterName, nodes, failures);
}
@Override
- public void readFrom(StreamInput in) throws IOException {
- super.readFrom(in);
- nodes = new NodeInfo[in.readVInt()];
- for (int i = 0; i < nodes.length; i++) {
- nodes[i] = NodeInfo.readNodeInfo(in);
- }
+ protected List readNodesFrom(StreamInput in) throws IOException {
+ return in.readList(NodeInfo::readNodeInfo);
}
@Override
- public void writeTo(StreamOutput out) throws IOException {
- super.writeTo(out);
- out.writeVInt(nodes.length);
- for (NodeInfo node : nodes) {
- node.writeTo(out);
- }
+ protected void writeNodesTo(StreamOutput out, List nodes) throws IOException {
+ out.writeStreamableList(nodes);
}
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
- builder.field("cluster_name", getClusterName().value());
-
builder.startObject("nodes");
- for (NodeInfo nodeInfo : this) {
+ for (NodeInfo nodeInfo : getNodes()) {
builder.startObject(nodeInfo.getNode().getId());
builder.field("name", nodeInfo.getNode().getName());
@@ -77,11 +69,8 @@ public class NodesInfoResponse extends BaseNodesResponse implements To
builder.field("version", nodeInfo.getVersion());
builder.field("build_hash", nodeInfo.getBuild().shortHash());
-
- if (nodeInfo.getServiceAttributes() != null) {
- for (Map.Entry nodeAttribute : nodeInfo.getServiceAttributes().entrySet()) {
- builder.field(nodeAttribute.getKey(), nodeAttribute.getValue());
- }
+ if (nodeInfo.getTotalIndexingBuffer() != null) {
+ builder.byteSizeField("total_indexing_buffer", "total_indexing_buffer_in_bytes", nodeInfo.getTotalIndexingBuffer());
}
builder.startArray("roles");
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
index f52729faa4f..028198cf831 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/info/TransportNodesInfoAction.java
@@ -19,10 +19,10 @@
package org.elasticsearch.action.admin.cluster.node.info;
+import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
import org.elasticsearch.action.support.nodes.TransportNodesAction;
-import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
@@ -34,36 +34,32 @@ import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicReferenceArray;
/**
*
*/
-public class TransportNodesInfoAction extends TransportNodesAction {
+public class TransportNodesInfoAction extends TransportNodesAction {
private final NodeService nodeService;
@Inject
- public TransportNodesInfoAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
+ public TransportNodesInfoAction(Settings settings, ThreadPool threadPool,
ClusterService clusterService, TransportService transportService,
- NodeService nodeService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
- super(settings, NodesInfoAction.NAME, clusterName, threadPool, clusterService, transportService, actionFilters,
- indexNameExpressionResolver, NodesInfoRequest::new, NodeInfoRequest::new, ThreadPool.Names.MANAGEMENT);
+ NodeService nodeService, ActionFilters actionFilters,
+ IndexNameExpressionResolver indexNameExpressionResolver) {
+ super(settings, NodesInfoAction.NAME, threadPool, clusterService, transportService, actionFilters,
+ indexNameExpressionResolver, NodesInfoRequest::new, NodeInfoRequest::new, ThreadPool.Names.MANAGEMENT, NodeInfo.class);
this.nodeService = nodeService;
}
@Override
- protected NodesInfoResponse newResponse(NodesInfoRequest nodesInfoRequest, AtomicReferenceArray responses) {
- final List nodesInfos = new ArrayList<>();
- for (int i = 0; i < responses.length(); i++) {
- Object resp = responses.get(i);
- if (resp instanceof NodeInfo) {
- nodesInfos.add((NodeInfo) resp);
- }
- }
- return new NodesInfoResponse(clusterName, nodesInfos.toArray(new NodeInfo[nodesInfos.size()]));
+ protected NodesInfoResponse newResponse(NodesInfoRequest nodesInfoRequest,
+ List responses, List failures) {
+ return new NodesInfoResponse(clusterService.getClusterName(), responses, failures);
}
@Override
@@ -80,7 +76,7 @@ public class TransportNodesInfoAction extends TransportNodesAction {
private final ClusterService clusterService;
- private final ClusterName clusterName;
public static final String NAME = "cluster:monitor/nodes/liveness";
@Inject
- public TransportLivenessAction(ClusterName clusterName,
- ClusterService clusterService, TransportService transportService) {
+ public TransportLivenessAction(ClusterService clusterService, TransportService transportService) {
this.clusterService = clusterService;
- this.clusterName = clusterName;
- transportService.registerRequestHandler(NAME, LivenessRequest::new, ThreadPool.Names.SAME, this);
+ transportService.registerRequestHandler(NAME, LivenessRequest::new, ThreadPool.Names.SAME,
+ false, false /*can not trip circuit breaker*/, this);
}
@Override
public void messageReceived(LivenessRequest request, TransportChannel channel) throws Exception {
- channel.sendResponse(new LivenessResponse(clusterName, clusterService.localNode()));
+ channel.sendResponse(new LivenessResponse(clusterService.getClusterName(), clusterService.localNode()));
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
index af28c1fb5d5..1a9023ab93c 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/NodesStatsResponse.java
@@ -19,6 +19,7 @@
package org.elasticsearch.action.admin.cluster.node.stats;
+import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.support.nodes.BaseNodesResponse;
import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.common.io.stream.StreamInput;
@@ -28,6 +29,7 @@ import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import java.io.IOException;
+import java.util.List;
/**
*
@@ -37,34 +39,24 @@ public class NodesStatsResponse extends BaseNodesResponse implements
NodesStatsResponse() {
}
- public NodesStatsResponse(ClusterName clusterName, NodeStats[] nodes) {
- super(clusterName, nodes);
+ public NodesStatsResponse(ClusterName clusterName, List nodes, List failures) {
+ super(clusterName, nodes, failures);
}
@Override
- public void readFrom(StreamInput in) throws IOException {
- super.readFrom(in);
- nodes = new NodeStats[in.readVInt()];
- for (int i = 0; i < nodes.length; i++) {
- nodes[i] = NodeStats.readNodeStats(in);
- }
+ protected List readNodesFrom(StreamInput in) throws IOException {
+ return in.readList(NodeStats::readNodeStats);
}
@Override
- public void writeTo(StreamOutput out) throws IOException {
- super.writeTo(out);
- out.writeVInt(nodes.length);
- for (NodeStats node : nodes) {
- node.writeTo(out);
- }
+ protected void writeNodesTo(StreamOutput out, List nodes) throws IOException {
+ out.writeStreamableList(nodes);
}
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
- builder.field("cluster_name", getClusterName().value());
-
builder.startObject("nodes");
- for (NodeStats nodeStats : this) {
+ for (NodeStats nodeStats : getNodes()) {
builder.startObject(nodeStats.getNode().getId());
builder.field("timestamp", nodeStats.getTimestamp());
nodeStats.toXContent(builder, params);
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
index 8ba3d00558b..5863e54d08f 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/stats/TransportNodesStatsAction.java
@@ -19,10 +19,10 @@
package org.elasticsearch.action.admin.cluster.node.stats;
+import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.nodes.BaseNodeRequest;
import org.elasticsearch.action.support.nodes.TransportNodesAction;
-import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
@@ -34,36 +34,31 @@ import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
import java.io.IOException;
-import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.atomic.AtomicReferenceArray;
/**
*
*/
-public class TransportNodesStatsAction extends TransportNodesAction {
+public class TransportNodesStatsAction extends TransportNodesAction {
private final NodeService nodeService;
@Inject
- public TransportNodesStatsAction(Settings settings, ClusterName clusterName, ThreadPool threadPool,
+ public TransportNodesStatsAction(Settings settings, ThreadPool threadPool,
ClusterService clusterService, TransportService transportService,
- NodeService nodeService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
- super(settings, NodesStatsAction.NAME, clusterName, threadPool, clusterService, transportService, actionFilters, indexNameExpressionResolver,
- NodesStatsRequest::new, NodeStatsRequest::new, ThreadPool.Names.MANAGEMENT);
+ NodeService nodeService, ActionFilters actionFilters,
+ IndexNameExpressionResolver indexNameExpressionResolver) {
+ super(settings, NodesStatsAction.NAME, threadPool, clusterService, transportService, actionFilters,
+ indexNameExpressionResolver, NodesStatsRequest::new, NodeStatsRequest::new, ThreadPool.Names.MANAGEMENT, NodeStats.class);
this.nodeService = nodeService;
}
@Override
- protected NodesStatsResponse newResponse(NodesStatsRequest nodesInfoRequest, AtomicReferenceArray responses) {
- final List nodeStats = new ArrayList<>();
- for (int i = 0; i < responses.length(); i++) {
- Object resp = responses.get(i);
- if (resp instanceof NodeStats) {
- nodeStats.add((NodeStats) resp);
- }
- }
- return new NodesStatsResponse(clusterName, nodeStats.toArray(new NodeStats[nodeStats.size()]));
+ protected NodesStatsResponse newResponse(NodesStatsRequest request, List responses, List failures) {
+ return new NodesStatsResponse(clusterService.getClusterName(), responses, failures);
}
@Override
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java
index 716e9027bf0..9bfeaecd78b 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/CancelTasksResponse.java
@@ -22,7 +22,7 @@ package org.elasticsearch.action.admin.cluster.node.tasks.cancel;
import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.TaskOperationFailure;
import org.elasticsearch.action.admin.cluster.node.tasks.list.ListTasksResponse;
-import org.elasticsearch.action.admin.cluster.node.tasks.list.TaskInfo;
+import org.elasticsearch.tasks.TaskInfo;
import java.util.List;
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java
index a52a0358983..6d5936db67a 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/cancel/TransportCancelTasksAction.java
@@ -22,10 +22,8 @@ package org.elasticsearch.action.admin.cluster.node.tasks.cancel;
import org.elasticsearch.ResourceNotFoundException;
import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.TaskOperationFailure;
-import org.elasticsearch.action.admin.cluster.node.tasks.list.TaskInfo;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.tasks.TransportTasksAction;
-import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.node.DiscoveryNode;
@@ -36,6 +34,7 @@ import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.tasks.CancellableTask;
import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.tasks.TaskInfo;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.EmptyTransportResponseHandler;
import org.elasticsearch.transport.TransportChannel;
@@ -63,10 +62,10 @@ public class TransportCancelTasksAction extends TransportTasksAction {
+/**
+ * Action for retrieving a list of currently running tasks
+ */
+public class GetTaskAction extends Action {
- public static final RenderSearchTemplateAction INSTANCE = new RenderSearchTemplateAction();
- public static final String NAME = "cluster:admin/render/template/search";
+ public static final GetTaskAction INSTANCE = new GetTaskAction();
+ public static final String NAME = "cluster:monitor/task/get";
- public RenderSearchTemplateAction() {
+ private GetTaskAction() {
super(NAME);
}
@Override
- public RenderSearchTemplateRequestBuilder newRequestBuilder(ElasticsearchClient client) {
- return new RenderSearchTemplateRequestBuilder(client, this);
+ public GetTaskResponse newResponse() {
+ return new GetTaskResponse();
}
@Override
- public RenderSearchTemplateResponse newResponse() {
- return new RenderSearchTemplateResponse();
+ public GetTaskRequestBuilder newRequestBuilder(ElasticsearchClient client) {
+ return new GetTaskRequestBuilder(client, this);
}
-
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java
new file mode 100644
index 00000000000..efbc9679e71
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequest.java
@@ -0,0 +1,119 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you 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.
+ */
+
+package org.elasticsearch.action.admin.cluster.node.tasks.get;
+
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.common.io.stream.StreamInput;
+import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.tasks.TaskId;
+
+import java.io.IOException;
+
+import static org.elasticsearch.action.ValidateActions.addValidationError;
+
+/**
+ * A request to get node tasks
+ */
+public class GetTaskRequest extends ActionRequest {
+ private TaskId taskId = TaskId.EMPTY_TASK_ID;
+ private boolean waitForCompletion = false;
+ private TimeValue timeout = null;
+
+ /**
+ * Get the TaskId to look up.
+ */
+ public TaskId getTaskId() {
+ return taskId;
+ }
+
+ /**
+ * Set the TaskId to look up. Required.
+ */
+ public GetTaskRequest setTaskId(TaskId taskId) {
+ this.taskId = taskId;
+ return this;
+ }
+
+ /**
+ * Should this request wait for all found tasks to complete?
+ */
+ public boolean getWaitForCompletion() {
+ return waitForCompletion;
+ }
+
+ /**
+ * Should this request wait for all found tasks to complete?
+ */
+ public GetTaskRequest setWaitForCompletion(boolean waitForCompletion) {
+ this.waitForCompletion = waitForCompletion;
+ return this;
+ }
+
+ /**
+ * Timeout to wait for any async actions this request must take. It must take anywhere from 0 to 2.
+ */
+ public TimeValue getTimeout() {
+ return timeout;
+ }
+
+ /**
+ * Timeout to wait for any async actions this request must take. It must take anywhere from 0 to 2.
+ */
+ public GetTaskRequest setTimeout(TimeValue timeout) {
+ this.timeout = timeout;
+ return this;
+ }
+
+ GetTaskRequest nodeRequest(String thisNodeId, long thisTaskId) {
+ GetTaskRequest copy = new GetTaskRequest();
+ copy.setParentTask(thisNodeId, thisTaskId);
+ copy.setTaskId(taskId);
+ copy.setTimeout(timeout);
+ copy.setWaitForCompletion(waitForCompletion);
+ return copy;
+ }
+
+ @Override
+ public ActionRequestValidationException validate() {
+ ActionRequestValidationException validationException = null;
+ if (false == getTaskId().isSet()) {
+ validationException = addValidationError("task id is required", validationException);
+ }
+ return validationException;
+ }
+
+ @Override
+ public void readFrom(StreamInput in) throws IOException {
+ super.readFrom(in);
+ taskId = TaskId.readFromStream(in);
+ timeout = in.readOptionalWriteable(TimeValue::new);
+ waitForCompletion = in.readBoolean();
+ }
+
+ @Override
+ public void writeTo(StreamOutput out) throws IOException {
+ super.writeTo(out);
+ taskId.writeTo(out);
+ out.writeOptionalWriteable(timeout);
+ out.writeBoolean(waitForCompletion);
+ }
+}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java
new file mode 100644
index 00000000000..e1042df2ac3
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskRequestBuilder.java
@@ -0,0 +1,58 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you 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.
+ */
+
+package org.elasticsearch.action.admin.cluster.node.tasks.get;
+
+import org.elasticsearch.action.ActionRequestBuilder;
+import org.elasticsearch.client.ElasticsearchClient;
+import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.tasks.TaskId;
+
+/**
+ * Builder for the request to retrieve the list of tasks running on the specified nodes
+ */
+public class GetTaskRequestBuilder extends ActionRequestBuilder {
+ public GetTaskRequestBuilder(ElasticsearchClient client, GetTaskAction action) {
+ super(client, action, new GetTaskRequest());
+ }
+
+ /**
+ * Set the TaskId to look up. Required.
+ */
+ public final GetTaskRequestBuilder setTaskId(TaskId taskId) {
+ request.setTaskId(taskId);
+ return this;
+ }
+
+ /**
+ * Should this request wait for all found tasks to complete?
+ */
+ public final GetTaskRequestBuilder setWaitForCompletion(boolean waitForCompletion) {
+ request.setWaitForCompletion(waitForCompletion);
+ return this;
+ }
+
+ /**
+ * Timeout to wait for any async actions this request must take. It must take anywhere from 0 to 2.
+ */
+ public final GetTaskRequestBuilder setTimeout(TimeValue timeout) {
+ request.setTimeout(timeout);
+ return this;
+ }
+}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/validate/template/RenderSearchTemplateResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java
similarity index 61%
rename from core/src/main/java/org/elasticsearch/action/admin/cluster/validate/template/RenderSearchTemplateResponse.java
rename to core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java
index d14a9a4f06a..afb03a7c9dc 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/validate/template/RenderSearchTemplateResponse.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/GetTaskResponse.java
@@ -17,52 +17,59 @@
* under the License.
*/
-package org.elasticsearch.action.admin.cluster.validate.template;
+package org.elasticsearch.action.admin.cluster.node.tasks.get;
import org.elasticsearch.action.ActionResponse;
-import org.elasticsearch.common.bytes.BytesReference;
+import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.tasks.PersistedTaskInfo;
import java.io.IOException;
-public class RenderSearchTemplateResponse extends ActionResponse implements ToXContent {
+import static java.util.Objects.requireNonNull;
- private BytesReference source;
+/**
+ * Returns the list of tasks currently running on the nodes
+ */
+public class GetTaskResponse extends ActionResponse implements ToXContent {
+ private PersistedTaskInfo task;
- public BytesReference source() {
- return source;
+ public GetTaskResponse() {
}
-
- public void source(BytesReference source) {
- this.source = source;
+
+ public GetTaskResponse(PersistedTaskInfo task) {
+ this.task = requireNonNull(task, "task is required");
}
-
- @Override
- public void writeTo(StreamOutput out) throws IOException {
- super.writeTo(out);
- boolean hasSource = source != null;
- out.writeBoolean(hasSource);
- if (hasSource) {
- out.writeBytesReference(source);
- }
- }
-
+
@Override
public void readFrom(StreamInput in) throws IOException {
super.readFrom(in);
- if (in.readBoolean()) {
- source = in.readBytesReference();
- }
+ task = in.readOptionalWriteable(PersistedTaskInfo::new);
+ }
+
+ @Override
+ public void writeTo(StreamOutput out) throws IOException {
+ super.writeTo(out);
+ out.writeOptionalWriteable(task);
+ }
+
+ /**
+ * Get the actual result of the fetch.
+ */
+ public PersistedTaskInfo getTask() {
+ return task;
}
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
- builder.startObject();
- builder.rawField("template_output", source);
- builder.endObject();
- return builder;
+ return task.innerToXContent(builder, params);
+ }
+
+ @Override
+ public String toString() {
+ return Strings.toString(this);
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java
new file mode 100644
index 00000000000..430b07866c9
--- /dev/null
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/get/TransportGetTaskAction.java
@@ -0,0 +1,245 @@
+/*
+ * Licensed to Elasticsearch under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch licenses this file to you 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.
+ */
+
+package org.elasticsearch.action.admin.cluster.node.tasks.get;
+
+import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.ExceptionsHelper;
+import org.elasticsearch.ResourceNotFoundException;
+import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.get.GetRequest;
+import org.elasticsearch.action.get.GetResponse;
+import org.elasticsearch.action.support.ActionFilters;
+import org.elasticsearch.action.support.HandledTransportAction;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.common.ParseFieldMatcher;
+import org.elasticsearch.common.inject.Inject;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.util.concurrent.AbstractRunnable;
+import org.elasticsearch.common.xcontent.XContentHelper;
+import org.elasticsearch.common.xcontent.XContentParser;
+import org.elasticsearch.index.IndexNotFoundException;
+import org.elasticsearch.tasks.PersistedTaskInfo;
+import org.elasticsearch.tasks.Task;
+import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.tasks.TaskInfo;
+import org.elasticsearch.tasks.TaskPersistenceService;
+import org.elasticsearch.threadpool.ThreadPool;
+import org.elasticsearch.transport.TransportException;
+import org.elasticsearch.transport.TransportRequestOptions;
+import org.elasticsearch.transport.TransportResponseHandler;
+import org.elasticsearch.transport.TransportService;
+
+import java.io.IOException;
+
+import static org.elasticsearch.action.admin.cluster.node.tasks.list.TransportListTasksAction.waitForCompletionTimeout;
+
+/**
+ * Action to get a single task. If the task isn't running then it'll try to request the status from request index.
+ *
+ * The general flow is:
+ *
+ * - If this isn't being executed on the node to which the requested TaskId belongs then move to that node.
+ *
- Look up the task and return it if it exists
+ *
- If it doesn't then look up the task from the results index
+ *
+ */
+public class TransportGetTaskAction extends HandledTransportAction {
+ private final ClusterService clusterService;
+ private final TransportService transportService;
+ private final Client client;
+
+ @Inject
+ public TransportGetTaskAction(Settings settings, ThreadPool threadPool, TransportService transportService, ActionFilters actionFilters,
+ IndexNameExpressionResolver indexNameExpressionResolver, ClusterService clusterService, Client client) {
+ super(settings, GetTaskAction.NAME, threadPool, transportService, actionFilters, indexNameExpressionResolver, GetTaskRequest::new);
+ this.clusterService = clusterService;
+ this.transportService = transportService;
+ this.client = client;
+ }
+
+ @Override
+ protected void doExecute(GetTaskRequest request, ActionListener listener) {
+ throw new UnsupportedOperationException("Task is required");
+ }
+
+ @Override
+ protected void doExecute(Task thisTask, GetTaskRequest request, ActionListener listener) {
+ if (clusterService.localNode().getId().equals(request.getTaskId().getNodeId())) {
+ getRunningTaskFromNode(thisTask, request, listener);
+ } else {
+ runOnNodeWithTaskIfPossible(thisTask, request, listener);
+ }
+ }
+
+ /**
+ * Executed on the coordinating node to forward execution of the remaining work to the node that matches that requested
+ * {@link TaskId#getNodeId()}. If the node isn't in the cluster then this will just proceed to
+ * {@link #getFinishedTaskFromIndex(Task, GetTaskRequest, ActionListener)} on this node.
+ */
+ private void runOnNodeWithTaskIfPossible(Task thisTask, GetTaskRequest request, ActionListener listener) {
+ TransportRequestOptions.Builder builder = TransportRequestOptions.builder();
+ if (request.getTimeout() != null) {
+ builder.withTimeout(request.getTimeout());
+ }
+ builder.withCompress(false);
+ DiscoveryNode node = clusterService.state().nodes().get(request.getTaskId().getNodeId());
+ if (node == null) {
+ // Node is no longer part of the cluster! Try and look the task up from the results index.
+ getFinishedTaskFromIndex(thisTask, request, listener);
+ return;
+ }
+ GetTaskRequest nodeRequest = request.nodeRequest(clusterService.localNode().getId(), thisTask.getId());
+ taskManager.registerChildTask(thisTask, node.getId());
+ transportService.sendRequest(node, GetTaskAction.NAME, nodeRequest, builder.build(),
+ new TransportResponseHandler() {
+ @Override
+ public GetTaskResponse newInstance() {
+ return new GetTaskResponse();
+ }
+
+ @Override
+ public void handleResponse(GetTaskResponse response) {
+ listener.onResponse(response);
+ }
+
+ @Override
+ public void handleException(TransportException exp) {
+ listener.onFailure(exp);
+ }
+
+ @Override
+ public String executor() {
+ return ThreadPool.Names.SAME;
+ }
+ });
+ }
+
+ /**
+ * Executed on the node that should be running the task to find and return the running task. Falls back to
+ * {@link #getFinishedTaskFromIndex(Task, GetTaskRequest, ActionListener)} if the task isn't still running.
+ */
+ void getRunningTaskFromNode(Task thisTask, GetTaskRequest request, ActionListener listener) {
+ Task runningTask = taskManager.getTask(request.getTaskId().getId());
+ if (runningTask == null) {
+ // Task isn't running, go look in the task index
+ getFinishedTaskFromIndex(thisTask, request, listener);
+ } else {
+ if (request.getWaitForCompletion()) {
+ // Shift to the generic thread pool and let it wait for the task to complete so we don't block any important threads.
+ threadPool.generic().execute(new AbstractRunnable() {
+ @Override
+ protected void doRun() throws Exception {
+ taskManager.waitForTaskCompletion(runningTask, waitForCompletionTimeout(request.getTimeout()));
+ waitedForCompletion(thisTask, request, runningTask.taskInfo(clusterService.localNode(), true), listener);
+ }
+
+ @Override
+ public void onFailure(Exception e) {
+ listener.onFailure(e);
+ }
+ });
+ } else {
+ TaskInfo info = runningTask.taskInfo(clusterService.localNode(), true);
+ listener.onResponse(new GetTaskResponse(new PersistedTaskInfo(false, info)));
+ }
+ }
+ }
+
+ /**
+ * Called after waiting for the task to complete. Attempts to load the results of the task from the tasks index. If it isn't in the
+ * index then returns a snapshot of the task taken shortly after completion.
+ */
+ void waitedForCompletion(Task thisTask, GetTaskRequest request, TaskInfo snapshotOfRunningTask,
+ ActionListener listener) {
+ getFinishedTaskFromIndex(thisTask, request, new ActionListener() {
+ @Override
+ public void onResponse(GetTaskResponse response) {
+ // We were able to load the task from the task index. Let's send that back.
+ listener.onResponse(response);
+ }
+
+ @Override
+ public void onFailure(Exception e) {
+ /*
+ * We couldn't load the task from the task index. Instead of 404 we should use the snapshot we took after it finished. If
+ * the error isn't a 404 then we'll just throw it back to the user.
+ */
+ if (ExceptionsHelper.unwrap(e, ResourceNotFoundException.class) != null) {
+ listener.onResponse(new GetTaskResponse(new PersistedTaskInfo(true, snapshotOfRunningTask)));
+ } else {
+ listener.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * Send a {@link GetRequest} to the tasks index looking for a persisted copy of the task completed task. It'll only be found only if the
+ * task's result was persisted. Called on the node that once had the task if that node is still part of the cluster or on the
+ * coordinating node if the node is no longer part of the cluster.
+ */
+ void getFinishedTaskFromIndex(Task thisTask, GetTaskRequest request, ActionListener listener) {
+ GetRequest get = new GetRequest(TaskPersistenceService.TASK_INDEX, TaskPersistenceService.TASK_TYPE,
+ request.getTaskId().toString());
+ get.setParentTask(clusterService.localNode().getId(), thisTask.getId());
+ client.get(get, new ActionListener() {
+ @Override
+ public void onResponse(GetResponse getResponse) {
+ try {
+ onGetFinishedTaskFromIndex(getResponse, listener);
+ } catch (Exception e) {
+ listener.onFailure(e);
+ }
+ }
+
+ @Override
+ public void onFailure(Exception e) {
+ if (ExceptionsHelper.unwrap(e, IndexNotFoundException.class) != null) {
+ // We haven't yet created the index for the task results so it can't be found.
+ listener.onFailure(new ResourceNotFoundException("task [{}] isn't running or persisted", e, request.getTaskId()));
+ } else {
+ listener.onFailure(e);
+ }
+ }
+ });
+ }
+
+ /**
+ * Called with the {@linkplain GetResponse} from loading the task from the results index. Called on the node that once had the task if
+ * that node is part of the cluster or on the coordinating node if the node wasn't part of the cluster.
+ */
+ void onGetFinishedTaskFromIndex(GetResponse response, ActionListener listener) throws IOException {
+ if (false == response.isExists()) {
+ listener.onFailure(new ResourceNotFoundException("task [{}] isn't running or persisted", response.getId()));
+ return;
+ }
+ if (response.isSourceEmpty()) {
+ listener.onFailure(new ElasticsearchException("Stored task status for [{}] didn't contain any source!", response.getId()));
+ return;
+ }
+ try (XContentParser parser = XContentHelper.createParser(response.getSourceAsBytesRef())) {
+ PersistedTaskInfo result = PersistedTaskInfo.PARSER.apply(parser, () -> ParseFieldMatcher.STRICT);
+ listener.onResponse(new GetTaskResponse(result));
+ }
+ }
+}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java
index 446ae3affb7..6ab0bafb2fb 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/ListTasksResponse.java
@@ -23,21 +23,21 @@ import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.TaskOperationFailure;
import org.elasticsearch.action.support.tasks.BaseTasksResponse;
import org.elasticsearch.cluster.node.DiscoveryNode;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.tasks.TaskId;
+import org.elasticsearch.tasks.TaskInfo;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
/**
@@ -47,10 +47,12 @@ public class ListTasksResponse extends BaseTasksResponse implements ToXContent {
private List tasks;
- private Map> nodes;
+ private Map> perNodeTasks;
private List groups;
+ private DiscoveryNodes discoveryNodes;
+
public ListTasksResponse() {
}
@@ -75,28 +77,11 @@ public class ListTasksResponse extends BaseTasksResponse implements ToXContent {
/**
* Returns the list of tasks by node
*/
- public Map> getPerNodeTasks() {
- if (nodes != null) {
- return nodes;
+ public Map> getPerNodeTasks() {
+ if (perNodeTasks == null) {
+ perNodeTasks = tasks.stream().collect(Collectors.groupingBy(t -> t.getTaskId().getNodeId()));
}
- Map> nodeTasks = new HashMap<>();
-
- Set nodes = new HashSet<>();
- for (TaskInfo shard : tasks) {
- nodes.add(shard.getNode());
- }
-
- for (DiscoveryNode node : nodes) {
- List tasks = new ArrayList<>();
- for (TaskInfo taskInfo : this.tasks) {
- if (taskInfo.getNode().equals(node)) {
- tasks.add(taskInfo);
- }
- }
- nodeTasks.put(node, tasks);
- }
- this.nodes = nodeTasks;
- return nodeTasks;
+ return perNodeTasks;
}
public List getTaskGroups() {
@@ -138,6 +123,14 @@ public class ListTasksResponse extends BaseTasksResponse implements ToXContent {
return tasks;
}
+ /**
+ * Set a reference to the {@linkplain DiscoveryNodes}. Used for calling {@link #toXContent(XContentBuilder, ToXContent.Params)} with
+ * {@code group_by=nodes}.
+ */
+ public void setDiscoveryNodes(DiscoveryNodes discoveryNodes) {
+ this.discoveryNodes = discoveryNodes;
+ }
+
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
if (getTaskFailures() != null && getTaskFailures().size() > 0) {
@@ -161,43 +154,48 @@ public class ListTasksResponse extends BaseTasksResponse implements ToXContent {
}
String groupBy = params.param("group_by", "nodes");
if ("nodes".equals(groupBy)) {
+ if (discoveryNodes == null) {
+ throw new IllegalStateException("discoveryNodes must be set before calling toXContent with group_by=nodes");
+ }
builder.startObject("nodes");
- for (Map.Entry> entry : getPerNodeTasks().entrySet()) {
- DiscoveryNode node = entry.getKey();
- builder.startObject(node.getId());
- builder.field("name", node.getName());
- builder.field("transport_address", node.getAddress().toString());
- builder.field("host", node.getHostName());
- builder.field("ip", node.getAddress());
+ for (Map.Entry> entry : getPerNodeTasks().entrySet()) {
+ DiscoveryNode node = discoveryNodes.get(entry.getKey());
+ builder.startObject(entry.getKey());
+ if (node != null) {
+ // If the node is no longer part of the cluster, oh well, we'll just skip it's useful information.
+ builder.field("name", node.getName());
+ builder.field("transport_address", node.getAddress().toString());
+ builder.field("host", node.getHostName());
+ builder.field("ip", node.getAddress());
- builder.startArray("roles");
- for (DiscoveryNode.Role role : node.getRoles()) {
- builder.value(role.getRoleName());
- }
- builder.endArray();
-
- if (!node.getAttributes().isEmpty()) {
- builder.startObject("attributes");
- for (Map.Entry attrEntry : node.getAttributes().entrySet()) {
- builder.field(attrEntry.getKey(), attrEntry.getValue());
+ builder.startArray("roles");
+ for (DiscoveryNode.Role role : node.getRoles()) {
+ builder.value(role.getRoleName());
+ }
+ builder.endArray();
+
+ if (!node.getAttributes().isEmpty()) {
+ builder.startObject("attributes");
+ for (Map.Entry attrEntry : node.getAttributes().entrySet()) {
+ builder.field(attrEntry.getKey(), attrEntry.getValue());
+ }
+ builder.endObject();
}
- builder.endObject();
}
builder.startObject("tasks");
for(TaskInfo task : entry.getValue()) {
- builder.startObject(task.getTaskId().toString());
+ builder.field(task.getTaskId().toString());
task.toXContent(builder, params);
- builder.endObject();
}
builder.endObject();
builder.endObject();
}
+ builder.endObject();
} else if ("parents".equals(groupBy)) {
builder.startObject("tasks");
for (TaskGroup group : getTaskGroups()) {
- builder.startObject(group.getTaskInfo().getTaskId().toString());
+ builder.field(group.getTaskInfo().getTaskId().toString());
group.toXContent(builder, params);
- builder.endObject();
}
builder.endObject();
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java
index aa9bfd6b720..b254137163d 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TaskGroup.java
@@ -21,6 +21,7 @@ package org.elasticsearch.action.admin.cluster.node.tasks.list;
import org.elasticsearch.common.xcontent.ToXContent;
import org.elasticsearch.common.xcontent.XContentBuilder;
+import org.elasticsearch.tasks.TaskInfo;
import java.io.IOException;
import java.util.ArrayList;
@@ -79,16 +80,15 @@ public class TaskGroup implements ToXContent {
@Override
public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException {
- task.toXContent(builder, params);
+ builder.startObject();
+ task.innerToXContent(builder, params);
if (childTasks.isEmpty() == false) {
builder.startArray("children");
for (TaskGroup taskGroup : childTasks) {
- builder.startObject();
taskGroup.toXContent(builder, params);
- builder.endObject();
}
builder.endArray();
}
- return builder;
+ return builder.endObject();
}
}
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java
index b05049f6776..26158800346 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/node/tasks/list/TransportListTasksAction.java
@@ -19,13 +19,10 @@
package org.elasticsearch.action.admin.cluster.node.tasks.list;
-import org.elasticsearch.ElasticsearchException;
-import org.elasticsearch.ElasticsearchTimeoutException;
import org.elasticsearch.action.FailedNodeException;
import org.elasticsearch.action.TaskOperationFailure;
import org.elasticsearch.action.support.ActionFilters;
import org.elasticsearch.action.support.tasks.TransportTasksAction;
-import org.elasticsearch.cluster.ClusterName;
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.inject.Inject;
@@ -33,6 +30,7 @@ import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.tasks.Task;
+import org.elasticsearch.tasks.TaskInfo;
import org.elasticsearch.threadpool.ThreadPool;
import org.elasticsearch.transport.TransportService;
@@ -40,20 +38,25 @@ import java.io.IOException;
import java.util.List;
import java.util.function.Consumer;
-import static org.elasticsearch.common.unit.TimeValue.timeValueMillis;
import static org.elasticsearch.common.unit.TimeValue.timeValueSeconds;
/**
*
*/
public class TransportListTasksAction extends TransportTasksAction {
- private static final TimeValue WAIT_FOR_COMPLETION_POLL = timeValueMillis(100);
+ public static long waitForCompletionTimeout(TimeValue timeout) {
+ if (timeout == null) {
+ timeout = DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT;
+ }
+ return System.nanoTime() + timeout.nanos();
+ }
+
private static final TimeValue DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT = timeValueSeconds(30);
@Inject
- public TransportListTasksAction(Settings settings, ClusterName clusterName, ThreadPool threadPool, ClusterService clusterService,
+ public TransportListTasksAction(Settings settings, ThreadPool threadPool, ClusterService clusterService,
TransportService transportService, ActionFilters actionFilters, IndexNameExpressionResolver indexNameExpressionResolver) {
- super(settings, ListTasksAction.NAME, clusterName, threadPool, clusterService, transportService, actionFilters,
+ super(settings, ListTasksAction.NAME, threadPool, clusterService, transportService, actionFilters,
indexNameExpressionResolver, ListTasksRequest::new, ListTasksResponse::new, ThreadPool.Names.MANAGEMENT);
}
@@ -75,35 +78,18 @@ public class TransportListTasksAction extends TransportTasksAction operation) {
- if (false == request.getWaitForCompletion()) {
- super.processTasks(request, operation);
- return;
- }
- // If we should wait for completion then we have to intercept every found task and wait for it to leave the manager.
- TimeValue timeout = request.getTimeout();
- if (timeout == null) {
- timeout = DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT;
- }
- long timeoutTime = System.nanoTime() + timeout.nanos();
- super.processTasks(request, operation.andThen((Task t) -> {
- while (System.nanoTime() - timeoutTime < 0) {
- Task task = taskManager.getTask(t.getId());
- if (task == null) {
- return;
- }
+ if (request.getWaitForCompletion()) {
+ long timeoutNanos = waitForCompletionTimeout(request.getTimeout());
+ operation = operation.andThen(task -> {
if (task.getAction().startsWith(ListTasksAction.NAME)) {
// It doesn't make sense to wait for List Tasks and it can cause an infinite loop of the task waiting
- // for itself of one of its child tasks
+ // for itself or one of its child tasks
return;
}
- try {
- Thread.sleep(WAIT_FOR_COMPLETION_POLL.millis());
- } catch (InterruptedException e) {
- throw new ElasticsearchException("Interrupted waiting for completion of [{}]", e, t);
- }
- }
- throw new ElasticsearchTimeoutException("Timed out waiting for completion of [{}]", t);
- }));
+ taskManager.waitForTaskCompletion(task, timeoutNanos);
+ });
+ }
+ super.processTasks(request, operation);
}
@Override
diff --git a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
index a17d2aac892..6baf834278b 100644
--- a/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
+++ b/core/src/main/java/org/elasticsearch/action/admin/cluster/repositories/delete/TransportDeleteRepositoryAction.java
@@ -76,7 +76,7 @@ public class TransportDeleteRepositoryAction extends TransportMasterNodeAction {
- AllocationCommands commands = new AllocationCommands();
- boolean dryRun;
- boolean explain;
+ private AllocationCommands commands = new AllocationCommands();
+ private boolean dryRun;
+ private boolean explain;
+ private boolean retryFailed;
public ClusterRerouteRequest() {
}
@@ -81,6 +77,15 @@ public class ClusterRerouteRequest extends AcknowledgedRequest