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

Merge branch 'cassandra-3.11' into trunk

This commit is contained in:
Brandon Williams 2020-12-02 12:15:25 -06:00
parent d9e2ed00af 80a8deb81c
commit 7bdecd2176
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -18,6 +18,7 @@
Merged from 3.11:
* SASI's `max_compaction_flush_memory_in_mb` settings over 100GB revert to default of 1GB (CASSANDRA-16071)
Merged from 3.0:
* Synchronize transaction logs for JBOD (CASSANDRA-16225)
* Fix the counting of cells per partition (CASSANDRA-16259)
* Fix serial read/non-applying CAS linearizability (CASSANDRA-12126)
* Avoid potential NPE in JVMStabilityInspector (CASSANDRA-16294)

5
src/java/org/apache/cassandra/db/lifecycle/LogTransaction.java
View File

@ -153,7 +153,10 @@ class LogTransaction extends Transactional.AbstractTransactional implements Tran
*/
void untrackNew(SSTable table)
{
txnFile.remove(table);
synchronized (lock)
{
txnFile.remove(table);
}
}
/**