Skip to content

Commit 4a22026

Browse files
Merge branch '8.19' into charlotte-connectorsRN-8.19.5
2 parents c680f84 + dbc2126 commit 4a22026

File tree

7 files changed

+101
-19
lines changed

7 files changed

+101
-19
lines changed

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/InternalTestClustersPlugin.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111

1212
import org.elasticsearch.gradle.VersionProperties;
1313
import org.elasticsearch.gradle.internal.info.GlobalBuildInfoPlugin;
14-
import org.elasticsearch.gradle.testclusters.ElasticsearchCluster;
1514
import org.elasticsearch.gradle.testclusters.TestClustersPlugin;
16-
import org.gradle.api.NamedDomainObjectContainer;
1715
import org.gradle.api.Plugin;
1816
import org.gradle.api.Project;
1917

@@ -33,17 +31,5 @@ public void apply(Project project) {
3331
version -> (version.equals(VersionProperties.getElasticsearchVersion()) && buildParams.getSnapshotBuild() == false)
3432
|| buildParams.getBwcVersions().unreleasedInfo(version) == null
3533
);
36-
37-
NamedDomainObjectContainer<ElasticsearchCluster> testClusters = (NamedDomainObjectContainer<ElasticsearchCluster>) project
38-
.getExtensions()
39-
.getByName(TestClustersPlugin.EXTENSION_NAME);
40-
// Limit the number of allocated processors for all nodes to 2 in the cluster by default.
41-
// This is to ensure that the tests run consistently across different environments.
42-
String processorCount = shouldConfigureTestClustersWithOneProcessor() ? "1" : "2";
43-
testClusters.configureEach(elasticsearchCluster -> elasticsearchCluster.setting("node.processors", processorCount));
44-
}
45-
46-
private boolean shouldConfigureTestClustersWithOneProcessor() {
47-
return Boolean.parseBoolean(System.getProperty("tests.configure_test_clusters_with_one_processor", "false"));
4834
}
4935
}

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionDefinition.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@ public static TransportVersionDefinition fromString(Path file, String contents,
2222

2323
String idsLine = null;
2424
if (contents.isEmpty() == false) {
25-
String[] lines = contents.split(System.lineSeparator());
25+
// Regardless of whether windows newlines exist (they could be added by git), we split on line feed.
26+
// All we care about skipping lines with the comment character, so the remaining \r won't matter
27+
String[] lines = contents.split("\n");
2628
for (String line : lines) {
27-
line = line.replaceAll("\\s+", "");
29+
line = line.strip();
2830
if (line.startsWith("#") == false) {
2931
idsLine = line;
3032
break;

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/transport/TransportVersionUpperBound.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@ public static TransportVersionUpperBound fromString(Path file, String contents)
2424
String branch = filename.substring(slashIndex == -1 ? 0 : (slashIndex + 1), filename.length() - 4);
2525

2626
String idsLine = null;
27-
String[] lines = contents.split(System.lineSeparator());
27+
// Regardless of whether windows newlines exist (they could be added by git), we split on line feed.
28+
// All we care about skipping lines with the comment character, so the remaining \r won't matter
29+
String[] lines = contents.split("\n");
2830
for (String line : lines) {
29-
line = line.replaceAll("\\s+", "");
31+
line = line.strip();
3032
if (line.startsWith("#") == false) {
3133
idsLine = line;
3234
break;

build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,6 +1406,15 @@ private void createConfiguration() {
14061406
baseConfig.put("cluster.service.slow_master_task_logging_threshold", "5s");
14071407
}
14081408

1409+
// Limit the number of allocated processors for all nodes in the cluster by default.
1410+
// This is to ensure that the tests run consistently across different environments.
1411+
String processorCount = shouldConfigureTestClustersWithOneProcessor() ? "1" : "2";
1412+
if (getVersion().onOrAfter("7.6.0")) {
1413+
baseConfig.put("node.processors", processorCount);
1414+
} else {
1415+
baseConfig.put("processors", processorCount);
1416+
}
1417+
14091418
baseConfig.put("action.destructive_requires_name", "false");
14101419

14111420
HashSet<String> overriden = new HashSet<>(baseConfig.keySet());
@@ -1791,4 +1800,8 @@ private static class LinkCreationException extends UncheckedIOException {
17911800
super(message, cause);
17921801
}
17931802
}
1803+
1804+
private boolean shouldConfigureTestClustersWithOneProcessor() {
1805+
return Boolean.parseBoolean(System.getProperty("tests.configure_test_clusters_with_one_processor", "false"));
1806+
}
17941807
}

docs/reference/release-notes.asciidoc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
This section summarizes the changes in each release.
88

9+
* <<release-notes-8.19.5>>
910
* <<release-notes-8.19.4>>
1011
* <<release-notes-8.19.3>>
1112
* <<release-notes-8.19.2>>
@@ -106,6 +107,7 @@ This section summarizes the changes in each release.
106107

107108
--
108109

110+
include::release-notes/8.19.5.asciidoc[]
109111
include::release-notes/8.19.4.asciidoc[]
110112
include::release-notes/8.19.3.asciidoc[]
111113
include::release-notes/8.19.2.asciidoc[]
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
[[release-notes-8.19.5]]
2+
== {es} version 8.19.5
3+
4+
coming[8.19.5]
5+
6+
Also see <<breaking-changes-8.19,Breaking changes in 8.19>>.
7+
8+
[IMPORTANT]
9+
====
10+
The 8.19.5 release contains fixes for potential security vulnerabilities.
11+
Please see our https://discuss.elastic.co/c/announcements/security-announcements/31[security advisory] for more details.
12+
====
13+
14+
[[bug-8.19.5]]
15+
[float]
16+
=== Bug fixes
17+
18+
Aggregations::
19+
* Propagates filter() to aggregation functions' surrogates {es-pull}134461[#134461] (issue: {es-issue}134380[#134380])
20+
21+
Codec::
22+
* Address es819 tsdb doc values format performance bug {es-pull}135505[#135505] (issue: {es-issue}135340[#135340])
23+
24+
ES|QL::
25+
* Ban Limit + `MvExpand` before remote Enrich {es-pull}135051[#135051]
26+
* Fix async get results with inconsistent headers {es-pull}135078[#135078] (issue: {es-issue}135042[#135042])
27+
* Fix expiration time in ES|QL async {es-pull}135209[#135209] (issue: {es-issue}135169[#135169])
28+
29+
Engine::
30+
* Bypass MMap arena grouping as this has caused issues with too many regions being mapped {es-pull}135012[#135012]
31+
* Fix deadlock in `ThreadPoolMergeScheduler` when a failing merge closes the `IndexWriter` {es-pull}134656[#134656]
32+
33+
Geo::
34+
* `CentroidCalculator` does not return negative summation weights {es-pull}135176[#135176] (issue: {es-issue}131861[#131861])
35+
36+
Infra/Core::
37+
* Bug fix: Facilitate second retrieval of the same value {es-pull}134790[#134790] (issue: {es-issue}134770[#134770])
38+
39+
Infra/Node Lifecycle::
40+
* Fix systemd notify to use a shared arena {es-pull}135235[#135235]
41+
42+
Ingest Node::
43+
* Correctly apply field path to JSON processor when adding contents to document root {es-pull}135479[#135479]
44+
45+
Machine Learning::
46+
* Add .reindexed-v7-ml-anomalies-* to anomaly results template index pattern {es-pull}135270[#135270]
47+
* Gracefully shutdown model deployment when node is removed from assignment routing {es-pull}134673[#134673]
48+
* Reset health status on successful empty checkpoint {es-pull}135653[#135653] (issue: {es-issue}135650[#135650])
49+
* Tolerate mixed types in datafeed stats sort {es-pull}135096[#135096]
50+
51+
Mapping::
52+
* Avoid holding references to `SearchExecutionContext` in `SourceConfirmedTextQuery` {es-pull}134887[#134887]
53+
* Fix for creating semantic_text fields on pre-8.11 indices crashing Elasticsearch {es-pull}135845[#135845]
54+
* Fixed match only text block loader not working when a keyword multi field is present {es-pull}134582[#134582]
55+
56+
Search::
57+
* Fix KQL case-sensitivity for keyword fields in ES|QL {es-pull}135776[#135776] (issue: {es-issue}135772[#135772])
58+
59+
Transform::
60+
* Fix a bug in the GET _transform API that incorrectly claims some Transform configurations are missing {es-pull}134963[#134963] (issue: {es-issue}134263[#134263])
61+
* Prevent Transform from queuing too many PIT close requests by waiting for PIT to close before finishing the checkpoint {es-pull}134955[#134955] (issue: {es-issue}134925[#134925])
62+
63+
[[enhancement-8.19.5]]
64+
[float]
65+
=== Enhancements
66+
67+
Audit::
68+
* Change reindex to use ::es-redacted:: filtering {es-pull}135414[#135414]
69+
70+
Authorization::
71+
* [Island Browser] Add `manage`, `create_index`, `read`, `index`, `write`, `delete`, permission for third party agent indices `kibana_system` {es-pull}134636[#134636] (issue: {es-issue}134136[#134136])
72+
73+

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/local/DefaultSettingsProvider.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,11 @@ public Map<String, String> get(LocalNodeSpec nodeSpec) {
4444

4545
// Limit the number of allocated processors for all nodes in the cluster by default.
4646
// This is to ensure that the tests run consistently across different environments.
47-
settings.put("node.processors", "2");
47+
if (nodeSpec.getVersion().onOrAfter("7.6.0")) {
48+
settings.put("node.processors", "2");
49+
} else {
50+
settings.put("processors", "2");
51+
}
4852

4953
// Default the watermarks to absurdly low to prevent the tests from failing on nodes without enough disk space
5054
settings.put("cluster.routing.allocation.disk.watermark.low", "1b");

0 commit comments

Comments
 (0)