Skip to content

Commit c127f6e

Browse files
committed
Merge branch 'main' into feature/knn-vector-rescore-query
# Conflicts: # server/src/main/java/org/elasticsearch/TransportVersions.java
2 parents 3ef07fa + 2051401 commit c127f6e

File tree

425 files changed

+10902
-2480
lines changed

Some content is hidden

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

425 files changed

+10902
-2480
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@
2929
import org.gradle.api.provider.Property;
3030
import org.gradle.api.tasks.Input;
3131
import org.jetbrains.annotations.NotNull;
32+
import org.slf4j.Logger;
33+
import org.slf4j.LoggerFactory;
3234

3335
import java.io.BufferedInputStream;
3436
import java.io.BufferedOutputStream;
@@ -47,6 +49,8 @@
4749

4850
public abstract class ElasticsearchBuildCompletePlugin implements Plugin<Project> {
4951

52+
private static final Logger log = LoggerFactory.getLogger(ElasticsearchBuildCompletePlugin.class);
53+
5054
@Inject
5155
protected abstract FlowScope getFlowScope();
5256

@@ -241,8 +245,11 @@ private static void createBuildArchiveTar(List<File> files, File projectDir, Fil
241245
tOut.setLongFileMode(TarArchiveOutputStream.LONGFILE_GNU);
242246
tOut.setBigNumberMode(TarArchiveOutputStream.BIGNUMBER_STAR);
243247
for (Path path : files.stream().map(File::toPath).toList()) {
244-
if (!Files.isRegularFile(path)) {
245-
throw new IOException("Support only file!");
248+
if (Files.exists(path) == false) {
249+
log.warn("File disappeared before it could be added to CI archive: " + path);
250+
continue;
251+
} else if (!Files.isRegularFile(path)) {
252+
throw new IOException("Support only file!: " + path);
246253
}
247254

248255
long entrySize = Files.size(path);

distribution/src/config/log4j2.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ appender.deprecation_rolling.name = deprecation_rolling
6363
appender.deprecation_rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation.json
6464
appender.deprecation_rolling.layout.type = ECSJsonLayout
6565
# Intentionally follows a different pattern to above
66-
appender.deprecation_rolling.layout.dataset = deprecation.elasticsearch
66+
appender.deprecation_rolling.layout.dataset = elasticsearch.deprecation
6767
appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
6868

6969
appender.deprecation_rolling.filePattern = ${sys:es.logs.base_path}${sys:file.separator}${sys:es.logs.cluster_name}_deprecation-%i.json.gz

docs/changelog/116755.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116755
2+
summary: Smarter field caps with subscribable listener
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/116904.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 116904
2+
summary: Add a not-master state for desired balance
3+
area: Allocation
4+
type: enhancement
5+
issues: []

docs/changelog/116953.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 116953
2+
summary: Fix false positive date detection with trailing dot
3+
area: Mapping
4+
type: bug
5+
issues:
6+
- 116946

docs/changelog/116964.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 116964
2+
summary: "Support ST_ENVELOPE and related (ST_XMIN, ST_XMAX, ST_YMIN, ST_YMAX) functions"
3+
area: ES|QL
4+
type: feature
5+
issues:
6+
- 104875

docs/changelog/117199.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117199
2+
summary: Speed up bit compared with floats or bytes script operations
3+
area: Vector Search
4+
type: enhancement
5+
issues: []

docs/changelog/117213.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 117213
2+
summary: Fix reconstituting version string from components
3+
area: Ingest Node
4+
type: bug
5+
issues:
6+
- 116950

docs/changelog/117229.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
pr: 117229
2+
summary: "In this pr, a 400 error is returned when _source / _seq_no / _feature /\
3+
\ _nested_path / _field_names is requested, rather a 5xx"
4+
area: Search
5+
type: bug
6+
issues: []

docs/changelog/117230.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 117230
2+
summary: Make various alias retrieval APIs wait for cluster to unblock
3+
area: Distributed
4+
type: enhancement
5+
issues: []

0 commit comments

Comments
 (0)