diff --git a/docs/changelog/130308.yaml b/docs/changelog/130308.yaml new file mode 100644 index 0000000000000..f9386593744f1 --- /dev/null +++ b/docs/changelog/130308.yaml @@ -0,0 +1,5 @@ +pr: 130308 +summary: Force niofs for fdt tmp file read access when flushing stored fields +area: Logs +type: bug +issues: [] diff --git a/muted-tests.yml b/muted-tests.yml index ee13681a241a9..1fbc5b4241925 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -533,9 +533,6 @@ tests: - class: org.elasticsearch.qa.verify_version_constants.VerifyVersionConstantsIT method: testLuceneVersionConstant issue: https://github.com/elastic/elasticsearch/issues/125638 -- class: org.elasticsearch.index.store.FsDirectoryFactoryTests - method: testPreload - issue: https://github.com/elastic/elasticsearch/issues/129852 - class: org.elasticsearch.xpack.rank.rrf.RRFRankClientYamlTestSuiteIT method: test {yaml=rrf/950_pinned_interaction/rrf with pinned retriever as a sub-retriever} issue: https://github.com/elastic/elasticsearch/issues/129845 diff --git a/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java b/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java index d4ec647b992b5..39a5c03e27942 100644 --- a/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java +++ b/server/src/main/java/org/elasticsearch/index/store/FsDirectoryFactory.java @@ -46,7 +46,6 @@ public class FsDirectoryFactory implements IndexStorePlugin.DirectoryFactory { private static final Logger Log = LogManager.getLogger(FsDirectoryFactory.class); private static final FeatureFlag MADV_RANDOM_FEATURE_FLAG = new FeatureFlag("madv_random"); - private static final FeatureFlag TMP_FDT_NO_MMAP_FEATURE_FLAG = new FeatureFlag("tmp_fdt_no_mmap"); public static final Setting INDEX_LOCK_FACTOR_SETTING = new Setting<>("index.store.fs.fs_lock", "native", (s) -> { return switch (s) { @@ -261,8 +260,7 @@ static boolean useDelegate(String name, IOContext ioContext) { * @return whether to avoid using delegate if the file is a tmp fdt file. */ static boolean avoidDelegateForFdtTempFiles(String name, LuceneFilesExtensions extension) { - // NOTE, for now gated behind feature flag to observe impact of this change in benchmarks only: - return TMP_FDT_NO_MMAP_FEATURE_FLAG.isEnabled() && extension == LuceneFilesExtensions.TMP && name.contains("fdt"); + return extension == LuceneFilesExtensions.TMP && name.contains("fdt"); } MMapDirectory getDelegate() {