Skip to content

Commit 841b38c

Browse files
authored
Appropriately delegate for skipping async prefetching directIO (#136367)
This shouldn't delegate to `in` (which might be MMAP). Instead it should delegate to `super` (DirectIO) which will open a regular directIO input. This fixes the two recent test failures: closes: #136351 closes: #136331
1 parent cc14973 commit 841b38c

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

muted-tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -627,15 +627,9 @@ tests:
627627
- class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
628628
method: test {csv-spec:string.SpaceNegative}
629629
issue: https://github.com/elastic/elasticsearch/issues/136249
630-
- class: org.elasticsearch.index.store.AsyncDirectIODirectoryTests
631-
method: testIsLoadedOnSlice
632-
issue: https://github.com/elastic/elasticsearch/issues/136331
633630
- class: org.elasticsearch.cluster.coordination.NodeJoiningIT
634631
method: testNodeTriesToJoinClusterAndThenSameMasterIsElected
635632
issue: https://github.com/elastic/elasticsearch/issues/136332
636-
- class: org.elasticsearch.index.store.AsyncDirectIODirectoryTests
637-
method: testSeekPastEOFAndRead
638-
issue: https://github.com/elastic/elasticsearch/issues/136351
639633
- class: org.elasticsearch.xpack.restart.FullClusterRestartIT
640634
method: testDataStreams {cluster=UPGRADED}
641635
issue: https://github.com/elastic/elasticsearch/issues/136353

server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ public IndexInput openInput(String name, IOContext context) throws IOException {
325325
if (asyncPrefetchLimit > 0) {
326326
return new AsyncDirectIOIndexInput(getDirectory().resolve(name), blockSize, 8192, asyncPrefetchLimit);
327327
} else {
328-
return in.openInput(name, context);
328+
return super.openInput(name, context);
329329
}
330330
}
331331
}

0 commit comments

Comments
 (0)