Skip to content

Commit f8083f9

Browse files
pawankartik-elasticpawankartik-elastic
authored
Merge branch 'main' into pkar/msearch-mrt-fix
2 parents 53a50d1 + a642a2f commit f8083f9

File tree

3 files changed

+32
-42
lines changed

3 files changed

+32
-42
lines changed

‎muted-tests.yml‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -424,18 +424,9 @@ tests:
424424
- class: org.elasticsearch.xpack.security.authc.TokenServiceTests
425425
method: testSupersedingTokenEncryption
426426
issue: https://github.com/elastic/elasticsearch/issues/139031
427-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
428-
method: test {p0=search/370_profile/dfs knn vector profiling collector name}
429-
issue: https://github.com/elastic/elasticsearch/issues/139065
430-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
431-
method: test {p0=search.highlight/50_synthetic_source/text multi unified from vectors}
432-
issue: https://github.com/elastic/elasticsearch/issues/139066
433427
- class: org.elasticsearch.xpack.search.AsyncSearchConcurrentStatusIT
434428
method: testConcurrentStatusFetchWhileTaskCloses
435429
issue: https://github.com/elastic/elasticsearch/issues/138543
436-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
437-
method: test {p0=search.vectors/130_knn_query_nested_search/nested kNN search pre-filtered on alias with filter on top level fields}
438-
issue: https://github.com/elastic/elasticsearch/issues/139131
439430
- class: org.elasticsearch.xpack.logsdb.RandomizedRollingUpgradeIT
440431
method: testIndexingSyntheticSource
441432
issue: https://github.com/elastic/elasticsearch/issues/139152
@@ -445,9 +436,6 @@ tests:
445436
- class: org.elasticsearch.xpack.core.security.authc.AuthenticationTests
446437
method: testMaybeRewriteForOlderVersionWithCrossClusterAccessRewritesAuthenticationInMetadata
447438
issue: https://github.com/elastic/elasticsearch/issues/139167
448-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
449-
method: test {p0=eql/10_basic/Sequence checking correct join key ordering.}
450-
issue: https://github.com/elastic/elasticsearch/issues/139173
451439
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
452440
method: test {p0=search.retrievers/result-diversification/10_mmr_result_diversification_retriever/Test MMR result diversification single index float type}
453441
issue: https://github.com/elastic/elasticsearch/issues/139195
@@ -457,12 +445,6 @@ tests:
457445
- class: org.elasticsearch.xpack.esql.ccq.MultiClusterSpecIT
458446
method: test {csv-spec:spatial.ConvertFromStringParseError}
459447
issue: https://github.com/elastic/elasticsearch/issues/139213
460-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
461-
method: test {p0=search.vectors/180_update_dense_vector_type/Test update flat --> bbq_flat --> bbq_hnsw}
462-
issue: https://github.com/elastic/elasticsearch/issues/139253
463-
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
464-
method: test {p0=search.vectors/41_knn_search_half_byte_quantized_bfloat16/Knn search with mip}
465-
issue: https://github.com/elastic/elasticsearch/issues/139254
466448
- class: org.elasticsearch.xpack.inference.integration.AuthorizationTaskExecutorIT
467449
method: testCreatesEisChatCompletionEndpoint
468450
issue: https://github.com/elastic/elasticsearch/issues/138764
@@ -478,9 +460,12 @@ tests:
478460
- class: org.elasticsearch.multiproject.test.CoreWithMultipleProjectsClientYamlTestSuiteIT
479461
method: test {yaml=search.retrievers/result-diversification/10_mmr_result_diversification_retriever/Test MMR result diversification single index float type}
480462
issue: https://github.com/elastic/elasticsearch/issues/139335
481-
- class: org.elasticsearch.test.rest.yaml.RcsCcsCommonYamlTestSuiteIT
482-
method: test {p0=search.vectors/200_dense_vector_docvalue_fields/dense_vector docvalues with bfloat16}
483-
issue: https://github.com/elastic/elasticsearch/issues/139368
463+
- class: org.elasticsearch.test.rest.yaml.CcsCommonYamlTestSuiteIT
464+
method: test {p0=search/140_pre_filter_search_shards/prefilter on non-indexed date fields}
465+
issue: https://github.com/elastic/elasticsearch/issues/139381
466+
- class: org.elasticsearch.xpack.downsample.DownsampleIT
467+
method: testAggregateMethod
468+
issue: https://github.com/elastic/elasticsearch/issues/139382
484469

485470
# Examples:
486471
#

‎rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search.vectors/200_dense_vector_docvalue_fields.yml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -298,38 +298,38 @@ setup:
298298
- length: {hits.hits.0.fields.vector7.0: 5}
299299
- length: {hits.hits.0.fields.vector8.0: 5}
300300

301-
- close_to: { hits.hits.0.fields.vector7.0.0: { value: 230.0, error: 0.4 } }
302-
- close_to: { hits.hits.0.fields.vector7.0.1: { value: 300.33, error: 0.4 } }
303-
- close_to: { hits.hits.0.fields.vector7.0.2: { value: -34.8988, error: 0.4 } }
304-
- close_to: { hits.hits.0.fields.vector7.0.3: { value: 15.555, error: 0.4 } }
305-
- close_to: { hits.hits.0.fields.vector7.0.4: { value: -200.0, error: 0.4 } }
306-
307-
- close_to: { hits.hits.0.fields.vector8.0.0: { value: 130.0, error: 0.4 } }
308-
- close_to: { hits.hits.0.fields.vector8.0.1: { value: 115.0, error: 0.4 } }
309-
- close_to: { hits.hits.0.fields.vector8.0.2: { value: -1.02, error: 0.4 } }
310-
- close_to: { hits.hits.0.fields.vector8.0.3: { value: 15.555, error: 0.4 } }
311-
- close_to: { hits.hits.0.fields.vector8.0.4: { value: -100.0, error: 0.4 } }
301+
- close_to: { hits.hits.0.fields.vector7.0.0: { value: 230.0, error: 1 } }
302+
- close_to: { hits.hits.0.fields.vector7.0.1: { value: 300.33, error: 1 } }
303+
- close_to: { hits.hits.0.fields.vector7.0.2: { value: -34.8988, error: 0.2 } }
304+
- close_to: { hits.hits.0.fields.vector7.0.3: { value: 15.555, error: 0.2 } }
305+
- close_to: { hits.hits.0.fields.vector7.0.4: { value: -200.0, error: 1 } }
306+
307+
- close_to: { hits.hits.0.fields.vector8.0.0: { value: 130.0, error: 1 } }
308+
- close_to: { hits.hits.0.fields.vector8.0.1: { value: 115.0, error: 1 } }
309+
- close_to: { hits.hits.0.fields.vector8.0.2: { value: -1.02, error: 0.2 } }
310+
- close_to: { hits.hits.0.fields.vector8.0.3: { value: 15.555, error: 0.2 } }
311+
- close_to: { hits.hits.0.fields.vector8.0.4: { value: -100.0, error: 1 } }
312312

313313
- match: {hits.hits.1._id: "2"}
314314
- match: {hits.hits.1.fields.name.0: "moose.jpg"}
315315

316316
- length: {hits.hits.1.fields.vector7.0: 5}
317317
- match: {hits.hits.1.fields.vector8: null}
318318

319-
- close_to: { hits.hits.1.fields.vector7.0.0: { value: -0.5, error: 0.4 } }
320-
- close_to: { hits.hits.1.fields.vector7.0.1: { value: 100.0, error: 0.4 } }
321-
- close_to: { hits.hits.1.fields.vector7.0.2: { value: -13, error: 0.4 } }
322-
- close_to: { hits.hits.1.fields.vector7.0.3: { value: 14.8, error: 0.4 } }
323-
- close_to: { hits.hits.1.fields.vector7.0.4: { value: -156.0, error: 0.4 } }
319+
- close_to: { hits.hits.1.fields.vector7.0.0: { value: -0.5, error: 0.2 } }
320+
- close_to: { hits.hits.1.fields.vector7.0.1: { value: 100.0, error: 1 } }
321+
- close_to: { hits.hits.1.fields.vector7.0.2: { value: -13, error: 0.2 } }
322+
- close_to: { hits.hits.1.fields.vector7.0.3: { value: 14.8, error: 0.2 } }
323+
- close_to: { hits.hits.1.fields.vector7.0.4: { value: -156.0, error: 1 } }
324324

325325
- match: {hits.hits.2._id: "3"}
326326
- match: {hits.hits.2.fields.name.0: "rabbit.jpg"}
327327

328328
- length: {hits.hits.2.fields.vector8.0: 5}
329329
- match: {hits.hits.2.fields.vector7: null}
330330

331-
- close_to: { hits.hits.2.fields.vector8.0.0: { value: 130.0, error: 0.4 } }
332-
- close_to: { hits.hits.2.fields.vector8.0.1: { value: 115.0, error: 0.4 } }
333-
- close_to: { hits.hits.2.fields.vector8.0.2: { value: -1.02, error: 0.4 } }
334-
- close_to: { hits.hits.2.fields.vector8.0.3: { value: 15.555, error: 0.4 } }
335-
- close_to: { hits.hits.2.fields.vector8.0.4: { value: -100.0, error: 0.4 } }
331+
- close_to: { hits.hits.2.fields.vector8.0.0: { value: 130.0, error: 1 } }
332+
- close_to: { hits.hits.2.fields.vector8.0.1: { value: 115.0, error: 1 } }
333+
- close_to: { hits.hits.2.fields.vector8.0.2: { value: -1.02, error: 0.2 } }
334+
- close_to: { hits.hits.2.fields.vector8.0.3: { value: 15.555, error: 0.2 } }
335+
- close_to: { hits.hits.2.fields.vector8.0.4: { value: -100.0, error: 1 } }

‎server/src/main/java/org/elasticsearch/index/engine/ThreadPoolMergeExecutorService.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,9 @@ public Iterator<Setting<?>> settings() {
175175
* Initial value for IO write rate limit of individual merge tasks when doAutoIOThrottle is true
176176
*/
177177
static final ByteSizeValue START_IO_RATE = ByteSizeValue.ofMb(20L);
178+
179+
private static final Logger logger = LogManager.getLogger(ThreadPoolMergeExecutorService.class);
180+
178181
/**
179182
* Total number of submitted merge tasks that support IO auto throttling and that have not yet been run (or aborted).
180183
* This includes merge tasks that are currently running and that are backlogged (by their respective merge schedulers).
@@ -863,13 +866,15 @@ private static long newTargetIORateBytesPerSec(
863866
MIN_IO_RATE.getBytes(),
864867
currentTargetIORateBytesPerSec - currentTargetIORateBytesPerSec / 10L
865868
);
869+
logger.debug("Decreasing target IO rate for merges to {}", newTargetIORateBytesPerSec);
866870
} else if (currentlySubmittedIOThrottledMergeTasks > concurrentMergesCeilLimitForThrottling
867871
&& currentTargetIORateBytesPerSec < MAX_IO_RATE.getBytes()) {
868872
// increase target IO rate by 20% (capped)
869873
newTargetIORateBytesPerSec = Math.min(
870874
MAX_IO_RATE.getBytes(),
871875
currentTargetIORateBytesPerSec + currentTargetIORateBytesPerSec / 5L
872876
);
877+
logger.debug("Increasing target IO rate for merges to {}", newTargetIORateBytesPerSec);
873878
} else {
874879
newTargetIORateBytesPerSec = currentTargetIORateBytesPerSec;
875880
}

0 commit comments

Comments
 (0)