Skip to content

Commit a3f77c6

Browse files
authored
Remove tmp_fdt_no_mmap feature flag. (elastic#130308) (elastic#130335)
After running this change for a week, no regressions where detected in nightly benchmarks that use index sorting.
1 parent 2b01c9e commit a3f77c6

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

docs/changelog/130308.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
pr: 130308
2+
summary: Force niofs for fdt tmp file read access when flushing stored fields
3+
area: Logs
4+
type: bug
5+
issues: []

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -539,9 +539,6 @@ tests:
539539
- class: org.elasticsearch.qa.verify_version_constants.VerifyVersionConstantsIT
540540
method: testLuceneVersionConstant
541541
issue: https://github.com/elastic/elasticsearch/issues/125638
542-
- class: org.elasticsearch.index.store.FsDirectoryFactoryTests
543-
method: testPreload
544-
issue: https://github.com/elastic/elasticsearch/issues/129852
545542
- class: org.elasticsearch.xpack.rank.rrf.RRFRankClientYamlTestSuiteIT
546543
method: test {yaml=rrf/950_pinned_interaction/rrf with pinned retriever as a sub-retriever}
547544
issue: https://github.com/elastic/elasticsearch/issues/129845

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public class FsDirectoryFactory implements IndexStorePlugin.DirectoryFactory {
4646

4747
private static final Logger Log = LogManager.getLogger(FsDirectoryFactory.class);
4848
private static final FeatureFlag MADV_RANDOM_FEATURE_FLAG = new FeatureFlag("madv_random");
49-
private static final FeatureFlag TMP_FDT_NO_MMAP_FEATURE_FLAG = new FeatureFlag("tmp_fdt_no_mmap");
5049

5150
public static final Setting<LockFactory> INDEX_LOCK_FACTOR_SETTING = new Setting<>("index.store.fs.fs_lock", "native", (s) -> {
5251
return switch (s) {
@@ -261,8 +260,7 @@ static boolean useDelegate(String name, IOContext ioContext) {
261260
* @return whether to avoid using delegate if the file is a tmp fdt file.
262261
*/
263262
static boolean avoidDelegateForFdtTempFiles(String name, LuceneFilesExtensions extension) {
264-
// NOTE, for now gated behind feature flag to observe impact of this change in benchmarks only:
265-
return TMP_FDT_NO_MMAP_FEATURE_FLAG.isEnabled() && extension == LuceneFilesExtensions.TMP && name.contains("fdt");
263+
return extension == LuceneFilesExtensions.TMP && name.contains("fdt");
266264
}
267265

268266
MMapDirectory getDelegate() {

0 commit comments

Comments
 (0)