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

Split out truncation record locking to prevent it being blocked by slow interval tree build on removeEndpoint 

Patch by Matt Byrd; reviewed by Ariel Weisberg, Marcus Eriksson for CASSANDRA-20480
This commit is contained in:
Matt Byrd 2025-03-18 11:04:00 -07:00 committed by Ariel Weisberg
parent a777cf0392
commit 7f1503d9c9
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
5.1
* Split out truncation record lock (CASSANDRA-20480)
* Throw new IndexBuildInProgressException when queries fail during index build, instead of IndexNotAvailableException (CASSANDRA-20402)
* Fix Paxos repair interrupts running transactions (CASSANDRA-20469)
* Various fixes in constraint framework (CASSANDRA-20481)

45
src/java/org/apache/cassandra/db/SystemKeyspace.java
View File

@ -606,6 +606,8 @@ public final class SystemKeyspace
private static volatile Map<TableId, Pair<CommitLogPosition, Long>> truncationRecords;
private static final Object truncationRecordLock = new Object();
public enum BootstrapState
{
NEEDS_BOOTSTRAP,
@ -801,27 +803,33 @@ public final class SystemKeyspace
return status;
}
public static synchronized void saveTruncationRecord(ColumnFamilyStore cfs, long truncatedAt, CommitLogPosition position)
public static void saveTruncationRecord(ColumnFamilyStore cfs, long truncatedAt, CommitLogPosition position)
{
String req = "UPDATE system.%s SET truncated_at = truncated_at + ? WHERE key = '%s'";
executeInternal(format(req, LOCAL, LOCAL), truncationAsMapEntry(cfs, truncatedAt, position));
truncationRecords = null;
forceBlockingFlush(LOCAL);
synchronized (truncationRecordLock)
{
String req = "UPDATE system.%s SET truncated_at = truncated_at + ? WHERE key = '%s'";
executeInternal(format(req, LOCAL, LOCAL), truncationAsMapEntry(cfs, truncatedAt, position));
truncationRecords = null;
forceBlockingFlush(LOCAL);
}
}
/**
* This method is used to remove information about truncation time for specified column family
*/
public static synchronized void removeTruncationRecord(TableId id)
public static void removeTruncationRecord(TableId id)
{
Pair<CommitLogPosition, Long> truncationRecord = getTruncationRecord(id);
if (truncationRecord == null)
return;
synchronized (truncationRecordLock)
{
Pair<CommitLogPosition, Long> truncationRecord = getTruncationRecord(id);
if (truncationRecord == null)
return;
String req = "DELETE truncated_at[?] from system.%s WHERE key = '%s'";
executeInternal(format(req, LOCAL, LOCAL), id.asUUID());
truncationRecords = null;
forceBlockingFlush(LOCAL);
String req = "DELETE truncated_at[?] from system.%s WHERE key = '%s'";
executeInternal(format(req, LOCAL, LOCAL), id.asUUID());
truncationRecords = null;
forceBlockingFlush(LOCAL);
}
}
private static Map<UUID, ByteBuffer> truncationAsMapEntry(ColumnFamilyStore cfs, long truncatedAt, CommitLogPosition position)
@ -850,11 +858,14 @@ public final class SystemKeyspace
return record == null ? Long.MIN_VALUE : record.right;
}
private static synchronized Pair<CommitLogPosition, Long> getTruncationRecord(TableId id)
private static Pair<CommitLogPosition, Long> getTruncationRecord(TableId id)
{
if (truncationRecords == null)
truncationRecords = readTruncationRecords();
return truncationRecords.get(id);
synchronized (truncationRecordLock)
{
if (truncationRecords == null)
truncationRecords = readTruncationRecords();
return truncationRecords.get(id);
}
}
private static Map<TableId, Pair<CommitLogPosition, Long>> readTruncationRecords()