Skip to content

Commit f0b815f

Browse files
Merge branch 'main' into sql/unmute_121474
2 parents 0ec914d + 30a706a commit f0b815f

File tree

81 files changed

+2285
-1442
lines changed

Some content is hidden

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

81 files changed

+2285
-1442
lines changed

.buildkite/pipelines/periodic.template.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ steps:
8686
ES_RUNTIME_JAVA:
8787
- openjdk21
8888
- openjdk23
89+
- openjdk24
8990
GRADLE_TASK:
9091
- checkPart1
9192
- checkPart2

.buildkite/pipelines/periodic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,7 @@ steps:
505505
ES_RUNTIME_JAVA:
506506
- openjdk21
507507
- openjdk23
508+
- openjdk24
508509
GRADLE_TASK:
509510
- checkPart1
510511
- checkPart2

docs/changelog/120751.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 120751
2+
summary: Adding support for binary embedding type to Cohere service embedding type
3+
area: Machine Learning
4+
type: enhancement
5+
issues: []

docs/changelog/120807.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

docs/changelog/121240.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121240
2+
summary: Implement runtime skip_unavailable=true
3+
area: ES|QL
4+
type: enhancement
5+
issues: []

docs/changelog/121256.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121256
2+
summary: Run `TransportEnrichStatsAction` on local node
3+
area: Ingest Node
4+
type: enhancement
5+
issues: []

docs/changelog/121556.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 121556
2+
summary: Enable New Semantic Text Format Only On Newly Created Indices
3+
area: Mapping
4+
type: bug
5+
issues: []

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/DummyImplementations.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,10 @@
5252
* <p>
5353
* A bit like Mockito but way more painful.
5454
*/
55-
public class DummyImplementations {
55+
class DummyImplementations {
56+
57+
static class DummyLocaleServiceProvider extends LocaleServiceProvider {
5658

57-
public static class DummyLocaleServiceProvider extends LocaleServiceProvider {
5859
@Override
5960
public Locale[] getAvailableLocales() {
6061
throw unexpected();

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/RestEntitlementsCheckAction.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ static CheckAction alwaysDenied(CheckedRunnable<Exception> action) {
9696

9797
private static final Map<String, CheckAction> checkActions = Stream.concat(
9898
Stream.<Entry<String, CheckAction>>of(
99-
entry("static_reflection", deniedToPlugins(RestEntitlementsCheckAction::staticMethodNeverEntitledViaReflection)),
100-
entry("nonstatic_reflection", deniedToPlugins(RestEntitlementsCheckAction::nonstaticMethodNeverEntitledViaReflection)),
101-
entry("constructor_reflection", deniedToPlugins(RestEntitlementsCheckAction::constructorNeverEntitledViaReflection)),
10299
entry("runtime_exit", deniedToPlugins(RestEntitlementsCheckAction::runtimeExit)),
103100
entry("runtime_halt", deniedToPlugins(RestEntitlementsCheckAction::runtimeHalt)),
104101
entry("system_exit", deniedToPlugins(RestEntitlementsCheckAction::systemExit)),
@@ -341,11 +338,6 @@ private static void systemExit() {
341338
System.exit(123);
342339
}
343340

344-
private static void staticMethodNeverEntitledViaReflection() throws Exception {
345-
Method systemExit = System.class.getMethod("exit", int.class);
346-
systemExit.invoke(null, 123);
347-
}
348-
349341
private static void createClassLoader() throws IOException {
350342
try (var classLoader = new URLClassLoader("test", new URL[0], RestEntitlementsCheckAction.class.getClassLoader())) {
351343
logger.info("Created URLClassLoader [{}]", classLoader.getName());
@@ -356,11 +348,6 @@ private static void processBuilder_start() throws IOException {
356348
new ProcessBuilder("").start();
357349
}
358350

359-
private static void nonstaticMethodNeverEntitledViaReflection() throws Exception {
360-
Method processBuilderStart = ProcessBuilder.class.getMethod("start");
361-
processBuilderStart.invoke(new ProcessBuilder(""));
362-
}
363-
364351
private static void processBuilder_startPipeline() throws IOException {
365352
ProcessBuilder.startPipeline(List.of());
366353
}
@@ -399,10 +386,6 @@ private static void setHttpsConnectionProperties() {
399386
new DummyLocaleServiceProvider();
400387
}
401388

402-
private static void constructorNeverEntitledViaReflection() throws Exception {
403-
DummyLocaleServiceProvider.class.getConstructor().newInstance();
404-
}
405-
406389
private static void breakIteratorProvider$() {
407390
new DummyBreakIteratorProvider();
408391
}

muted-tests.yml

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ tests:
4646
- class: org.elasticsearch.packaging.test.WindowsServiceTests
4747
method: test81JavaOptsInJvmOptions
4848
issue: https://github.com/elastic/elasticsearch/issues/113313
49-
- class: org.elasticsearch.backwards.MixedClusterClientYamlTestSuiteIT
50-
method: test {p0=mtermvectors/10_basic/Tests catching other exceptions per item}
51-
issue: https://github.com/elastic/elasticsearch/issues/113325
5249
- class: org.elasticsearch.xpack.transform.integration.TransformIT
5350
method: testStopWaitForCheckpoint
5451
issue: https://github.com/elastic/elasticsearch/issues/106113
@@ -125,15 +122,9 @@ tests:
125122
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
126123
method: test {p0=search.highlight/50_synthetic_source/text multi unified from vectors}
127124
issue: https://github.com/elastic/elasticsearch/issues/117815
128-
- class: org.elasticsearch.xpack.esql.plugin.ClusterRequestTests
129-
method: testFallbackIndicesOptions
130-
issue: https://github.com/elastic/elasticsearch/issues/117937
131125
- class: org.elasticsearch.xpack.ml.integration.RegressionIT
132126
method: testTwoJobsWithSameRandomizeSeedUseSameTrainingSet
133127
issue: https://github.com/elastic/elasticsearch/issues/117805
134-
- class: org.elasticsearch.xpack.esql.action.EsqlActionTaskIT
135-
method: testCancelRequestWhenFailingFetchingPages
136-
issue: https://github.com/elastic/elasticsearch/issues/118193
137128
- class: org.elasticsearch.packaging.test.ArchiveTests
138129
method: test44AutoConfigurationNotTriggeredOnNotWriteableConfDir
139130
issue: https://github.com/elastic/elasticsearch/issues/118208
@@ -218,8 +209,6 @@ tests:
218209
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncEnrichStopIT
219210
method: testEnrichAfterStop
220211
issue: https://github.com/elastic/elasticsearch/issues/120757
221-
- class: org.elasticsearch.search.fieldcaps.FieldCapabilitiesIT
222-
issue: https://github.com/elastic/elasticsearch/issues/120772
223212
- class: org.elasticsearch.xpack.test.rest.XPackRestIT
224213
method: test {p0=ml/3rd_party_deployment/Test start deployment fails while model download in progress}
225214
issue: https://github.com/elastic/elasticsearch/issues/120810
@@ -387,9 +376,6 @@ tests:
387376
- class: org.elasticsearch.xpack.ml.integration.ClassificationIT
388377
method: testDependentVariableIsAliasToNested
389378
issue: https://github.com/elastic/elasticsearch/issues/121415
390-
- class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
391-
method: testLookupExplosionBigStringManyMatches
392-
issue: https://github.com/elastic/elasticsearch/issues/121465
393379
- class: org.elasticsearch.xpack.security.authc.jwt.JwtRealmSingleNodeTests
394380
method: testClientSecretRotation
395381
issue: https://github.com/elastic/elasticsearch/issues/120985
@@ -399,9 +385,6 @@ tests:
399385
- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
400386
method: test {yaml=cluster.health/10_basic/cluster health basic test}
401387
issue: https://github.com/elastic/elasticsearch/issues/121478
402-
- class: org.elasticsearch.xpack.esql.heap_attack.HeapAttackIT
403-
method: testLookupExplosionManyMatches
404-
issue: https://github.com/elastic/elasticsearch/issues/121481
405388
- class: org.elasticsearch.xpack.security.profile.ProfileIntegTests
406389
method: testGetUsersWithProfileUid
407390
issue: https://github.com/elastic/elasticsearch/issues/121483
@@ -411,15 +394,6 @@ tests:
411394
- class: org.elasticsearch.xpack.transform.checkpoint.TransformCCSCanMatchIT
412395
method: testTransformLifecycle_RangeQueryThatMatchesNoShards
413396
issue: https://github.com/elastic/elasticsearch/issues/121480
414-
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryIT
415-
method: testStopQueryLocal
416-
issue: https://github.com/elastic/elasticsearch/issues/121487
417-
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryIT
418-
method: testSuccessfulPathways
419-
issue: https://github.com/elastic/elasticsearch/issues/121488
420-
- class: org.elasticsearch.xpack.esql.action.CrossClusterAsyncQueryIT
421-
method: testAsyncQueriesWithLimit0
422-
issue: https://github.com/elastic/elasticsearch/issues/121489
423397
- class: org.elasticsearch.xpack.security.profile.ProfileIntegTests
424398
method: testSuggestProfilesWithHint
425399
issue: https://github.com/elastic/elasticsearch/issues/121116
@@ -449,6 +423,21 @@ tests:
449423
- class: org.elasticsearch.xpack.security.CoreWithSecurityClientYamlTestSuiteIT
450424
method: test {yaml=snapshot.create/10_basic/Create a snapshot for missing index}
451425
issue: https://github.com/elastic/elasticsearch/issues/121536
426+
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryUnavailableRemotesIT
427+
method: testRemoteOnlyCCSAgainstDisconnectedRemoteWithSkipUnavailableTrue
428+
issue: https://github.com/elastic/elasticsearch/issues/121578
429+
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
430+
method: testTasks
431+
issue: https://github.com/elastic/elasticsearch/issues/121626
432+
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
433+
method: testCloseSkipUnavailable
434+
issue: https://github.com/elastic/elasticsearch/issues/121627
435+
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
436+
method: testCancel
437+
issue: https://github.com/elastic/elasticsearch/issues/121632
438+
- class: org.elasticsearch.xpack.esql.action.CrossClustersCancellationIT
439+
method: testCancelSkipUnavailable
440+
issue: https://github.com/elastic/elasticsearch/issues/121631
452441

453442
# Examples:
454443
#

0 commit comments

Comments
 (0)