natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-5.0' into trunk 

* cassandra-5.0:
  Make Commitlog flush data safely in Direct IO mode
This commit is contained in:
Maxwell Guo 2025-06-17 23:26:54 +08:00
parent df4eae7fb9 8de4c9250e
commit 9a3fda57cd
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -199,6 +199,7 @@
* Add the ability to disable bulk loading of SSTables (CASSANDRA-18781) * Add the ability to disable bulk loading of SSTables (CASSANDRA-18781)
* Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787) * Clean up obsolete functions and simplify cql_version handling in cqlsh (CASSANDRA-18787)
Merged from 5.0: Merged from 5.0:
* Make Commitlog flush data safely in Direct IO mode (CASSANDRA-20692)
* Get SAI MemtableIndex refs before SSTableIndex refs at query time (CASSANDRA-20709) * Get SAI MemtableIndex refs before SSTableIndex refs at query time (CASSANDRA-20709)
* Fix MAX_SEGMENT_SIZE < chunkSize in MmappedRegions::updateState (CASSANDRA-20636) * Fix MAX_SEGMENT_SIZE < chunkSize in MmappedRegions::updateState (CASSANDRA-20636)
* Full Java 17 support (CASSANDRA-20681) * Full Java 17 support (CASSANDRA-20681)

7
src/java/org/apache/cassandra/db/commitlog/DirectIOSegment.java
View File

@ -177,7 +177,12 @@ public class DirectIOSegment extends CommitLogSegment
public DirectIOSegment build() public DirectIOSegment build()
{ {
return new DirectIOSegment(segmentManager, return new DirectIOSegment(segmentManager,
path -> FileChannel.open(path, StandardOpenOption.WRITE, StandardOpenOption.READ, StandardOpenOption.CREATE, ExtendedOpenOption.DIRECT), path -> FileChannel.open(path,
StandardOpenOption.WRITE,
StandardOpenOption.READ,
StandardOpenOption.CREATE,
StandardOpenOption.DSYNC,
ExtendedOpenOption.DIRECT),
fsBlockSize); fsBlockSize);
} }