Skip to content

Commit b1d5944

Browse files
authored
Merge branch 'main' into adding-settings-to-data-streams
2 parents 8d7875d + 12451b6 commit b1d5944

File tree

42 files changed

+2776
-160
lines changed

Some content is hidden

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

42 files changed

+2776
-160
lines changed

distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/SystemJvmOptions.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ static List<String> systemJvmOptions(Settings nodeSettings, final Map<String, St
6161
"-Dio.netty.noUnsafe=true",
6262
"-Dio.netty.noKeySetOptimization=true",
6363
"-Dio.netty.recycler.maxCapacityPerThread=0",
64+
// temporary until we get off-heap vector stats in Lucene 10.3
65+
"--add-opens=org.apache.lucene.core/org.apache.lucene.codecs.lucene99=org.elasticsearch.server",
66+
"--add-opens=org.apache.lucene.backward_codecs/org.apache.lucene.backward_codecs.lucene90=org.elasticsearch.server",
67+
"--add-opens=org.apache.lucene.backward_codecs/org.apache.lucene.backward_codecs.lucene91=org.elasticsearch.server",
68+
"--add-opens=org.apache.lucene.backward_codecs/org.apache.lucene.backward_codecs.lucene92=org.elasticsearch.server",
69+
"--add-opens=org.apache.lucene.backward_codecs/org.apache.lucene.backward_codecs.lucene94=org.elasticsearch.server",
70+
"--add-opens=org.apache.lucene.backward_codecs/org.apache.lucene.backward_codecs.lucene95=org.elasticsearch.server",
6471
// log4j 2
6572
"-Dlog4j.shutdownHookEnabled=false",
6673
"-Dlog4j2.disable.jmx=true",

docs/changelog/126704.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 126704
2+
summary: Add dense vector off-heap stats to Node stats and Index stats APIs
3+
area: "Vector Search"
4+
type: enhancement
5+
issues: []

muted-tests.yml

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -417,15 +417,6 @@ tests:
417417
- class: org.elasticsearch.packaging.test.DockerTests
418418
method: test026InstallBundledRepositoryPlugins
419419
issue: https://github.com/elastic/elasticsearch/issues/127081
420-
- class: org.elasticsearch.multiproject.test.XpackWithMultipleProjectsClientYamlTestSuiteIT
421-
method: test {yaml=esql/10_basic/basic with documents_found}
422-
issue: https://github.com/elastic/elasticsearch/issues/127088
423-
- class: org.elasticsearch.xpack.esql.qa.single_node.EsqlClientYamlAsyncIT
424-
method: test {p0=esql/10_basic/basic with documents_found}
425-
issue: https://github.com/elastic/elasticsearch/issues/127080
426-
- class: org.elasticsearch.xpack.esql.qa.multi_node.EsqlClientYamlIT
427-
method: test {p0=esql/10_basic/basic with documents_found}
428-
issue: https://github.com/elastic/elasticsearch/issues/127046
429420
- class: org.elasticsearch.search.query.QueryPhaseTimeoutTests
430421
method: testBulkScorerTimeout
431422
issue: https://github.com/elastic/elasticsearch/issues/127156
@@ -438,15 +429,7 @@ tests:
438429
- class: org.elasticsearch.xpack.esql.plugin.DataNodeRequestSenderIT
439430
method: testSearchWhileRelocating
440431
issue: https://github.com/elastic/elasticsearch/issues/127188
441-
- class: org.elasticsearch.synonyms.SynonymsManagementAPIServiceIT
442-
method: testUpdateRuleWithMaxSynonyms
443-
issue: https://github.com/elastic/elasticsearch/issues/127195
444-
- class: org.elasticsearch.synonyms.SynonymsManagementAPIServiceIT
445-
method: testCreateRuleWithMaxSynonyms
446-
issue: https://github.com/elastic/elasticsearch/issues/127203
447-
- class: org.elasticsearch.synonyms.SynonymsManagementAPIServiceIT
448-
method: testTooManySynonymsOnIndexTriggersWarning
449-
issue: https://github.com/elastic/elasticsearch/issues/127241
432+
450433

451434
# Examples:
452435
#

qa/ccs-common-rest/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ apply plugin: 'elasticsearch.internal-yaml-rest-test'
1010

1111
restResources {
1212
restApi {
13-
include 'capabilities', '_common', 'bulk', 'count', 'cluster', 'field_caps', 'get', 'knn_search', 'index', 'indices', 'msearch',
14-
'search', 'async_search', 'graph', '*_point_in_time', 'info', 'scroll', 'clear_scroll', 'search_mvt', 'eql', 'sql'
13+
include 'capabilities', 'cat.shards', '_common', 'bulk', 'count', 'cluster', 'field_caps', 'get', 'knn_search', 'index', 'indices', 'msearch',
14+
"nodes.stats", 'search', 'async_search', 'graph', '*_point_in_time', 'info', 'scroll', 'clear_scroll', 'search_mvt', 'eql', 'sql'
1515
}
1616
restTests {
1717
includeCore 'field_caps', 'msearch', 'search', 'suggest', 'scroll', "indices.resolve_index"

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_basic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -351,6 +351,7 @@
351351
- match: { indices.docs.count: 5 }
352352
- match: { indices.docs.deleted: 0 }
353353
- match: { indices.dense_vector.value_count: 8 }
354+
- is_false: indices.dense_vector.off_heap
354355

355356
---
356357
"Sparse vector stats":

0 commit comments

Comments
 (0)