Compare commits

..

No commits in common. "37890ee3cb6c476aebe9c1c93f4d6651b83bc6b2" and "495cbdea644945ae82eeb76de1665be37b597b84" have entirely different histories.

2 changed files with 5 additions and 3 deletions

View File

@ -14,7 +14,7 @@
<dbengine.ci>false</dbengine.ci>
<micrometer.version>1.10.4</micrometer.version>
<lucene.version>9.8.0</lucene.version>
<rocksdb.version>8.8.1</rocksdb.version>
<rocksdb.version>8.6.7</rocksdb.version>
<junit.jupiter.version>5.9.0</junit.jupiter.version>
<data.generator.version>1.0.21</data.generator.version>
</properties>

View File

@ -477,7 +477,7 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa
} catch (RocksDBException ex) {
switch (ex.getMessage()) {
case "Direct I/O is not supported by the specified DB." -> {
logger.warn("RocksDB options failed: {}", ex.getLocalizedMessage());
logger.warn(ex.getLocalizedMessage());
rocksdbOptions
.setUseDirectReads(false)
.setUseDirectIoForFlushAndCompaction(false)
@ -1091,7 +1091,9 @@ public class LLLocalKeyValueDatabase extends Backuppable implements LLKeyValueDa
.setAllowMmapWrites(allowMmapWrites);
}
options.setUseDirectIoForFlushAndCompaction(true);
if (useDirectIO || !allowMmapWrites) {
options.setUseDirectIoForFlushAndCompaction(true);
}
return new OptionsWithCache(options, blockCache);
} catch (IOException e) {