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:
  Use OpOrder in repairIterator to ensure we don't lose memtables mid-paxos repair
This commit is contained in:
Blake Eggleston 2024-07-01 10:32:32 -07:00
parent 487f59e66c 732fb758c6
commit 6263fb3a64
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -90,6 +90,7 @@ Merged from 5.0:
* Fix resource cleanup after SAI query timeouts (CASSANDRA-19177)
* Suppress CVE-2023-6481 (CASSANDRA-19184)
Merged from 4.1:
* Use OpOrder in repairIterator to ensure we don't lose memtables mid-paxos repair (Cassandra-19668)
* Refresh stale paxos commit (CASSANDRA-19617)
* Reduce info logging from automatic paxos repair (CASSANDRA-19445)
* Support legacy plain_text_auth section in credentials file removed unintentionally (CASSANDRA-19498)

30
src/java/org/apache/cassandra/service/paxos/uncommitted/PaxosUncommittedIndex.java
View File

@ -64,6 +64,7 @@ import org.apache.cassandra.schema.Indexes;
import org.apache.cassandra.schema.TableId;
import org.apache.cassandra.service.ClientState;
import org.apache.cassandra.utils.CloseableIterator;
import org.apache.cassandra.utils.concurrent.OpOrder;
import static java.util.Collections.singletonList;
import static org.apache.cassandra.schema.SchemaConstants.SYSTEM_KEYSPACE_NAME;
@ -150,21 +151,24 @@ public class PaxosUncommittedIndex implements Index, PaxosUncommittedTracker.Upd
{
Preconditions.checkNotNull(tableId);
View view = baseCfs.getTracker().getView();
List<Memtable> memtables = view.flushingMemtables.isEmpty()
? view.liveMemtables
: ImmutableList.<Memtable>builder().addAll(view.flushingMemtables).addAll(view.liveMemtables).build();
List<DataRange> dataRanges = ranges.stream().map(DataRange::forTokenRange).collect(Collectors.toList());
List<UnfilteredPartitionIterator> iters = new ArrayList<>(memtables.size() * ranges.size());
for (int j=0, jsize=dataRanges.size(); j<jsize; j++)
try(OpOrder.Group op = baseCfs.readOrdering.start())
{
for (int i=0, isize=memtables.size(); i<isize; i++)
iters.add(memtables.get(i).partitionIterator(memtableColumnFilter, dataRanges.get(j), SSTableReadsListener.NOOP_LISTENER));
}
View view = baseCfs.getTracker().getView();
return getPaxosUpdates(iters, tableId, false);
List<Memtable> memtables = view.flushingMemtables.isEmpty()
? view.liveMemtables
: ImmutableList.<Memtable>builder().addAll(view.flushingMemtables).addAll(view.liveMemtables).build();
List<DataRange> dataRanges = ranges.stream().map(DataRange::forTokenRange).collect(Collectors.toList());
List<UnfilteredPartitionIterator> iters = new ArrayList<>(memtables.size() * ranges.size());
for (int j = 0, jsize = dataRanges.size(); j < jsize; j++)
{
for (int i = 0, isize = memtables.size(); i < isize; i++)
iters.add(memtables.get(i).partitionIterator(memtableColumnFilter, dataRanges.get(j), SSTableReadsListener.NOOP_LISTENER));
}
return getPaxosUpdates(iters, tableId, false);
}
}
public CloseableIterator<PaxosKeyState> flushIterator(Memtable flushing)