Skip to content

Commit 86ddf79

Browse files
jasontedorjasontedor
committed
Merge branch 'master' into global-checkpoint-sync
* master: (67 commits) Restoring from snapshot should force generation of a new history uuid (elastic#26694) test: Use a single primary shard so that the exception can caught in the same way Move pre-6.0 node checkpoint to SequenceNumbers Invalid JSON request body caused endless loop (elastic#26680) added comment fix line length violation Moved the check to fetch phase. This basically means that we throw a better error message instead of an AOBE and not adding more restrictions. inner hits: Do not allow inner hits that use _source and have a non nested object field as parent Separate Painless Whitelist Loading from the Painless Definition (elastic#26540) convert more admin requests to writeable (elastic#26566) Handle release of 5.6.1 Allow `InputStreamStreamInput` array size validation where applicable (elastic#26692) Update global checkpoint with permit after recovery Filter pre-6.0 nodes for checkpoint invariants Skip bad request REST test on pre-6.0 Reenable BWC tests after disabling for backport Add global checkpoint tracking on the primary [Test] Fix reference/cat/allocation/line_8 test failure [Docs] improved description for fs.total.available_in_bytes (elastic#26657) Fix discovery-file plugin to use custom config path ...
2 parents e1dc814 + 04385a9 commit 86ddf79

File tree

333 files changed

+6373
-3904
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

333 files changed

+6373
-3904
lines changed

‎build.gradle‎

Lines changed: 30 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -204,25 +204,15 @@ task branchConsistency {
204204
}
205205

206206
subprojects {
207-
project.afterEvaluate {
208-
// ignore missing javadocs
209-
tasks.withType(Javadoc) { Javadoc javadoc ->
210-
// the -quiet here is because of a bug in gradle, in that adding a string option
211-
// by itself is not added to the options. By adding quiet, both this option and
212-
// the "value" -quiet is added, separated by a space. This is ok since the javadoc
213-
// command already adds -quiet, so we are just duplicating it
214-
// see https://discuss.gradle.org/t/add-custom-javadoc-option-that-does-not-take-an-argument/5959
215-
javadoc.options.encoding='UTF8'
216-
javadoc.options.addStringOption('Xdoclint:all,-missing', '-quiet')
217-
/*
218-
TODO: building javadocs with java 9 b118 is currently broken with weird errors, so
219-
for now this is commented out...try again with the next ea build...
220-
javadoc.executable = new File(project.javaHome, 'bin/javadoc')
221-
if (project.javaVersion == JavaVersion.VERSION_1_9) {
222-
// TODO: remove this hack! gradle should be passing this...
223-
javadoc.options.addStringOption('source', '8')
224-
}*/
225-
}
207+
// ignore missing javadocs
208+
tasks.withType(Javadoc) { Javadoc javadoc ->
209+
// the -quiet here is because of a bug in gradle, in that adding a string option
210+
// by itself is not added to the options. By adding quiet, both this option and
211+
// the "value" -quiet is added, separated by a space. This is ok since the javadoc
212+
// command already adds -quiet, so we are just duplicating it
213+
// see https://discuss.gradle.org/t/add-custom-javadoc-option-that-does-not-take-an-argument/5959
214+
javadoc.options.encoding='UTF8'
215+
javadoc.options.addStringOption('Xdoclint:all,-missing', '-quiet')
226216
}
227217

228218
/* Sets up the dependencies that we build as part of this project but
@@ -280,6 +270,27 @@ subprojects {
280270
}
281271
}
282272
}
273+
274+
// Handle javadoc dependencies across projects. Order matters: the linksOffline for
275+
// org.elasticsearch:elasticsearch must be the last one or all the links for the
276+
// other packages (e.g org.elasticsearch.client) will point to core rather than
277+
// their own artifacts.
278+
if (project.plugins.hasPlugin(BuildPlugin)) {
279+
String artifactsHost = VersionProperties.elasticsearch.endsWith("-SNAPSHOT") ? "https://snapshots.elastic.co" : "https://artifacts.elastic.co"
280+
Closure sortClosure = { a, b -> b.group <=> a.group }
281+
Closure depJavadocClosure = { dep ->
282+
if (dep.group != null && dep.group.startsWith('org.elasticsearch')) {
283+
String substitution = project.ext.projectSubstitutions.get("${dep.group}:${dep.name}:${dep.version}")
284+
if (substitution != null) {
285+
project.javadoc.dependsOn substitution + ':javadoc'
286+
String artifactPath = dep.group.replaceAll('\\.', '/') + '/' + dep.name.replaceAll('\\.', '/') + '/' + dep.version
287+
project.javadoc.options.linksOffline artifactsHost + "/javadoc/" + artifactPath, "${project.project(substitution).buildDir}/docs/javadoc/"
288+
}
289+
}
290+
}
291+
project.configurations.compile.dependencies.findAll().toSorted(sortClosure).each(depJavadocClosure)
292+
project.configurations.provided.dependencies.findAll().toSorted(sortClosure).each(depJavadocClosure)
293+
}
283294
}
284295
}
285296

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -455,28 +455,8 @@ class BuildPlugin implements Plugin<Project> {
455455
}
456456

457457
static void configureJavadoc(Project project) {
458-
String artifactsHost = VersionProperties.elasticsearch.endsWith("-SNAPSHOT") ? "https://snapshots.elastic.co" : "https://artifacts.elastic.co"
459-
project.afterEvaluate {
460-
project.tasks.withType(Javadoc) {
461-
executable = new File(project.javaHome, 'bin/javadoc')
462-
}
463-
/*
464-
* Order matters, the linksOffline for org.elasticsearch:elasticsearch must be the last one
465-
* or all the links for the other packages (e.g org.elasticsearch.client) will point to core rather than their own artifacts
466-
*/
467-
Closure sortClosure = { a, b -> b.group <=> a.group }
468-
Closure depJavadocClosure = { dep ->
469-
if (dep.group != null && dep.group.startsWith('org.elasticsearch')) {
470-
String substitution = project.ext.projectSubstitutions.get("${dep.group}:${dep.name}:${dep.version}")
471-
if (substitution != null) {
472-
project.javadoc.dependsOn substitution + ':javadoc'
473-
String artifactPath = dep.group.replaceAll('\\.', '/') + '/' + dep.name.replaceAll('\\.', '/') + '/' + dep.version
474-
project.javadoc.options.linksOffline artifactsHost + "/javadoc/" + artifactPath, "${project.project(substitution).buildDir}/docs/javadoc/"
475-
}
476-
}
477-
}
478-
project.configurations.compile.dependencies.findAll().toSorted(sortClosure).each(depJavadocClosure)
479-
project.configurations.provided.dependencies.findAll().toSorted(sortClosure).each(depJavadocClosure)
458+
project.tasks.withType(Javadoc) {
459+
executable = new File(project.javaHome, 'bin/javadoc')
480460
}
481461
configureJavadocJar(project)
482462
}

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/precommit/ForbiddenPatternsTask.groovy‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@ public class ForbiddenPatternsTask extends DefaultTask {
6363
patterns.put('nocommit should be all lowercase or all uppercase',
6464
/((?i)nocommit)(?<!(nocommit|NOCOMMIT))/)
6565
patterns.put('tab', /\t/)
66-
if (System.getProperty('build.snapshot', 'true').equals('false')) {
67-
patterns.put('norelease', /norelease|NORELEASE/)
68-
}
69-
patterns.put('norelease should be all lowercase or all uppercase',
70-
/((?i)norelease)(?<!(norelease|NORELEASE))/)
7166

7267

7368
inputs.property("excludes", filesFilter.excludes)

‎buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -489,6 +489,7 @@ class ClusterFormationTasks {
489489
}
490490
Copy installModule = project.tasks.create(name, Copy.class)
491491
installModule.dependsOn(setup)
492+
installModule.dependsOn(module.tasks.bundlePlugin)
492493
installModule.into(new File(node.homeDir, "modules/${module.name}"))
493494
installModule.from({ project.zipTree(module.tasks.bundlePlugin.outputs.files.singleFile) })
494495
return installModule

‎buildSrc/src/main/resources/checkstyle_suppressions.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,6 @@
596596
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]PathMapperTests.java" checks="LineLength" />
597597
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]RoutingFieldMapperTests.java" checks="LineLength" />
598598
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]SourceFieldMapperTests.java" checks="LineLength" />
599-
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]TokenCountFieldMapperIntegrationIT.java" checks="LineLength" />
600599
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]UpdateMappingOnClusterIT.java" checks="LineLength" />
601600
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]UpdateMappingTests.java" checks="LineLength" />
602601
<suppress files="core[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]query[/\\]BoolQueryBuilderTests.java" checks="LineLength" />
@@ -740,11 +739,6 @@
740739
<suppress files="plugins[/\\]discovery-ec2[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]ec2[/\\]AmazonEC2Mock.java" checks="LineLength" />
741740
<suppress files="plugins[/\\]discovery-gce[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]discovery[/\\]gce[/\\]GceNetworkTests.java" checks="LineLength" />
742741
<suppress files="plugins[/\\]mapper-murmur3[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]index[/\\]mapper[/\\]murmur3[/\\]Murmur3FieldMapper.java" checks="LineLength" />
743-
<suppress files="plugins[/\\]repository-azure[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]azure[/\\]blobstore[/\\]AzureBlobContainer.java" checks="LineLength" />
744-
<suppress files="plugins[/\\]repository-azure[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]azure[/\\]blobstore[/\\]AzureBlobStore.java" checks="LineLength" />
745-
<suppress files="plugins[/\\]repository-azure[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]azure[/\\]storage[/\\]AzureStorageServiceImpl.java" checks="LineLength" />
746-
<suppress files="plugins[/\\]repository-azure[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]azure[/\\]storage[/\\]AzureStorageSettings.java" checks="LineLength" />
747-
<suppress files="plugins[/\\]repository-azure[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]cloud[/\\]azure[/\\]storage[/\\]AzureStorageServiceMock.java" checks="LineLength" />
748742
<suppress files="plugins[/\\]repository-hdfs[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]repositories[/\\]hdfs[/\\]HdfsRepository.java" checks="LineLength" />
749743
<suppress files="plugins[/\\]repository-hdfs[/\\]src[/\\]test[/\\]java[/\\]org[/\\]elasticsearch[/\\]repositories[/\\]hdfs[/\\]HdfsTests.java" checks="LineLength" />
750744
<suppress files="plugins[/\\]repository-s3[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]repositories[/\\]s3[/\\]S3Repository.java" checks="LineLength" />

‎client/rest/src/main/java/org/elasticsearch/client/ResponseException.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.http.util.EntityUtils;
2525

2626
import java.io.IOException;
27+
import java.util.Locale;
2728

2829
/**
2930
* Exception thrown when an elasticsearch node responds to a request with a status code that indicates an error.
@@ -39,8 +40,13 @@ public ResponseException(Response response) throws IOException {
3940
}
4041

4142
private static String buildMessage(Response response) throws IOException {
42-
String message = response.getRequestLine().getMethod() + " " + response.getHost() + response.getRequestLine().getUri()
43-
+ ": " + response.getStatusLine().toString();
43+
String message = String.format(Locale.ROOT,
44+
"method [%s], host [%s], URI [%s], status line [%s]",
45+
response.getRequestLine().getMethod(),
46+
response.getHost(),
47+
response.getRequestLine().getUri(),
48+
response.getStatusLine().toString()
49+
);
4450

4551
HttpEntity entity = response.getEntity();
4652
if (entity != null) {

‎client/rest/src/test/java/org/elasticsearch/client/ResponseExceptionTests.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import java.io.ByteArrayInputStream;
3737
import java.io.IOException;
3838
import java.nio.charset.StandardCharsets;
39+
import java.util.Locale;
3940

4041
import static org.junit.Assert.assertEquals;
4142
import static org.junit.Assert.assertNull;
@@ -74,8 +75,14 @@ public void testResponseException() throws IOException {
7475
assertNull(responseException.getResponse().getEntity());
7576
}
7677

77-
String message = response.getRequestLine().getMethod() + " " + response.getHost() + response.getRequestLine().getUri()
78-
+ ": " + response.getStatusLine().toString();
78+
String message = String.format(Locale.ROOT,
79+
"method [%s], host [%s], URI [%s], status line [%s]",
80+
response.getRequestLine().getMethod(),
81+
response.getHost(),
82+
response.getRequestLine().getUri(),
83+
response.getStatusLine().toString()
84+
);
85+
7986
if (hasBody) {
8087
message += "\n" + responseBody;
8188
}

‎client/sniffer/src/test/java/org/elasticsearch/client/sniff/ElasticsearchHostsSnifferTests.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555

5656
import static org.hamcrest.CoreMatchers.containsString;
5757
import static org.hamcrest.CoreMatchers.equalTo;
58+
import static org.hamcrest.CoreMatchers.startsWith;
5859
import static org.junit.Assert.assertEquals;
5960
import static org.junit.Assert.assertThat;
6061
import static org.junit.Assert.fail;
@@ -128,7 +129,9 @@ public void testSniffNodes() throws IOException {
128129
} catch(ResponseException e) {
129130
Response response = e.getResponse();
130131
if (sniffResponse.isFailure) {
131-
assertThat(e.getMessage(), containsString("GET " + httpHost + "/_nodes/http?timeout=" + sniffRequestTimeout + "ms"));
132+
final String errorPrefix = "method [GET], host [" + httpHost + "], URI [/_nodes/http?timeout=" + sniffRequestTimeout
133+
+ "ms], status line [HTTP/1.1";
134+
assertThat(e.getMessage(), startsWith(errorPrefix));
132135
assertThat(e.getMessage(), containsString(Integer.toString(sniffResponse.nodesInfoResponseCode)));
133136
assertThat(response.getHost(), equalTo(httpHost));
134137
assertThat(response.getStatusLine().getStatusCode(), equalTo(sniffResponse.nodesInfoResponseCode));

‎core/src/main/java/org/elasticsearch/Version.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ public class Version implements Comparable<Version> {
9292
public static final Version V_5_5_3 = new Version(V_5_5_3_ID, org.apache.lucene.util.Version.LUCENE_6_6_0);
9393
public static final int V_5_6_0_ID = 5060099;
9494
public static final Version V_5_6_0 = new Version(V_5_6_0_ID, org.apache.lucene.util.Version.LUCENE_6_6_0);
95+
public static final int V_5_6_1_ID = 5060199;
96+
// TODO use proper Lucene constant once we are on a Lucene snapshot that knows about 6.6.1
97+
public static final Version V_5_6_1 = new Version(V_5_6_1_ID, org.apache.lucene.util.Version.fromBits(6, 6, 1));
98+
public static final int V_5_6_2_ID = 5060299;
99+
// TODO use proper Lucene constant once we are on a Lucene snapshot that knows about 6.6.1
100+
public static final Version V_5_6_2 = new Version(V_5_6_2_ID, org.apache.lucene.util.Version.fromBits(6, 6, 1));
95101
public static final int V_6_0_0_alpha1_ID = 6000001;
96102
public static final Version V_6_0_0_alpha1 =
97103
new Version(V_6_0_0_alpha1_ID, org.apache.lucene.util.Version.LUCENE_7_0_0);
@@ -142,6 +148,10 @@ public static Version fromId(int id) {
142148
return V_6_0_0_alpha2;
143149
case V_6_0_0_alpha1_ID:
144150
return V_6_0_0_alpha1;
151+
case V_5_6_2_ID:
152+
return V_5_6_2;
153+
case V_5_6_1_ID:
154+
return V_5_6_1;
145155
case V_5_6_0_ID:
146156
return V_5_6_0;
147157
case V_5_5_3_ID:

‎core/src/main/java/org/elasticsearch/action/DocWriteResponse.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public abstract class DocWriteResponse extends ReplicationResponse implements Wr
6060
private static final String FORCED_REFRESH = "forced_refresh";
6161

6262
/**
63-
* An enum that represents the the results of CRUD operations, primarily used to communicate the type of
63+
* An enum that represents the results of CRUD operations, primarily used to communicate the type of
6464
* operation that occurred.
6565
*/
6666
public enum Result implements Writeable {

0 commit comments

Comments
 (0)