Skip to content

KAFKA-18883: Move TransactionLog to transaction-coordinator module #20456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TaiJuWu wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

KAFKA-18883: Move TransactionLog to transaction-coordinator module #20456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ef2d284
move to java
TaiJuWu Sep 2, 2025
5102110
remove scala version
TaiJuWu Dec 20, 2025
03640d3
fix build and minor rewrite
TaiJuWu Sep 2, 2025
687e3b3
fix build
TaiJuWu Dec 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 0 additions & 140 deletions core/src/main/scala/kafka/coordinator/transaction/TransactionLog.scala
View file
Open in desktop

This file was deleted.

27 changes: 15 additions & 12 deletions core/src/main/scala/kafka/coordinator/transaction/TransactionStateManager.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse
import org.apache.kafka.common.requests.TransactionResult
import org.apache.kafka.common.utils.{Time, Utils}
import org.apache.kafka.common.{KafkaException, TopicIdPartition, TopicPartition}
import org.apache.kafka.coordinator.transaction.{TransactionLogConfig, TransactionMetadata, TransactionState, TransactionStateManagerConfig, TxnTransitMetadata}
import org.apache.kafka.coordinator.transaction.{TransactionLog, TransactionLogConfig, TransactionMetadata, TransactionState, TransactionStateManagerConfig, TxnTransitMetadata}
import org.apache.kafka.metadata.MetadataCache
import org.apache.kafka.server.common.{RequestLocal, TransactionVersion}
import org.apache.kafka.server.config.ServerConfigs
Expand Down Expand Up @@ -183,7 +183,7 @@ class TransactionStateManager(brokerId: Int,
if (recordsBuilder == null) {
recordsBuilder = MemoryRecords.builder(
ByteBuffer.allocate(math.min(16384, maxBatchSize)),
TransactionLog.EnforcedCompression,
TransactionLog.ENFORCED_COMPRESSION,
TimestampType.CREATE_TIME,
0L,
maxBatchSize
Expand Down Expand Up @@ -290,7 +290,7 @@ class TransactionStateManager(brokerId: Int,
inReadLock(stateLock) {
replicaManager.appendRecords(
timeout = config.requestTimeoutMs,
requiredAcks = TransactionLog.EnforcedRequiredAcks,
requiredAcks = TransactionLog.ENFORCED_REQUIRED_ACKS,
internalTopicsAllowed = true,
origin = AppendOrigin.COORDINATOR,
entriesPerPartition = Map(replicaManager.topicIdPartition(transactionPartition) -> tombstoneRecords),
Expand Down Expand Up @@ -496,18 +496,21 @@ class TransactionStateManager(brokerId: Int,
for (record <- batch.asScala) {
require(record.hasKey, "Transaction state log's key should not be null")
TransactionLog.readTxnRecordKey(record.key) match {
case Left(version) =>
case version: java.lang.Short =>
warn(s"Unknown message key with version $version" +
s" while loading transaction state from $topicPartition. Ignoring it. " +
"It could be a left over from an aborted upgrade.")
case Right(transactionalId) =>
case transactionalId: String =>
// load transaction metadata along with transaction state
TransactionLog.readTxnRecordValue(transactionalId, record.value) match {
case None =>
loadedTransactions.remove(transactionalId)
case Some(txnMetadata) =>
loadedTransactions.put(transactionalId, txnMetadata)
val txnMetadata = TransactionLog.readTxnRecordValue(transactionalId, record.value)
if (txnMetadata == null) {
loadedTransactions.remove(transactionalId)
} else {
loadedTransactions.put(transactionalId, txnMetadata)
}
case other =>
warn(s"Unexpected key type ${other.getClass.getName} while loading transaction state " +
s"from $topicPartition. Ignoring it.")
}
}
currOffset = batch.nextOffset
Expand Down Expand Up @@ -663,7 +666,7 @@ class TransactionStateManager(brokerId: Int,
val valueBytes = TransactionLog.valueToBytes(newMetadata, transactionVersionLevel())
val timestamp = time.milliseconds()

val records = MemoryRecords.withRecords(TransactionLog.EnforcedCompression, new SimpleRecord(timestamp, keyBytes, valueBytes))
val records = MemoryRecords.withRecords(TransactionLog.ENFORCED_COMPRESSION, new SimpleRecord(timestamp, keyBytes, valueBytes))
val transactionStateTopicPartition = new TopicPartition(Topic.TRANSACTION_STATE_TOPIC_NAME, partitionFor(transactionalId))
val transactionStateTopicIdPartition = replicaManager.topicIdPartition(transactionStateTopicPartition)
val recordsPerPartition = Map(transactionStateTopicIdPartition -> records)
Expand Down Expand Up @@ -806,7 +809,7 @@ class TransactionStateManager(brokerId: Int,
if (append) {
replicaManager.appendRecords(
timeout = newMetadata.txnTimeoutMs.toLong,
requiredAcks = TransactionLog.EnforcedRequiredAcks,
requiredAcks = TransactionLog.ENFORCED_REQUIRED_ACKS,
internalTopicsAllowed = true,
origin = AppendOrigin.COORDINATOR,
entriesPerPartition = recordsPerPartition,
Expand Down
2 changes: 1 addition & 1 deletion ...test/scala/unit/kafka/coordinator/transaction/TransactionCoordinatorConcurrencyTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import org.apache.kafka.common.record.{FileRecords, MemoryRecords, RecordBatch,
import org.apache.kafka.common.requests._
import org.apache.kafka.common.utils.{LogContext, MockTime, ProducerIdAndEpoch}
import org.apache.kafka.common.{Node, TopicPartition, Uuid}
import org.apache.kafka.coordinator.transaction.{ProducerIdManager, TransactionMetadata, TransactionState}
import org.apache.kafka.coordinator.transaction.{ProducerIdManager, TransactionLog, TransactionMetadata, TransactionState}
import org.apache.kafka.metadata.MetadataCache
import org.apache.kafka.server.common.{FinalizedFeatures, MetadataVersion, RequestLocal, TransactionVersion}
import org.apache.kafka.server.storage.log.FetchIsolation
Expand Down
8 changes: 4 additions & 4 deletions core/src/test/scala/unit/kafka/coordinator/transaction/TransactionStateManagerTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.apache.kafka.common.record._
import org.apache.kafka.common.requests.ProduceResponse.PartitionResponse
import org.apache.kafka.common.requests.TransactionResult
import org.apache.kafka.common.utils.MockTime
import org.apache.kafka.coordinator.transaction.{TransactionMetadata, TransactionState, TxnTransitMetadata}
import org.apache.kafka.coordinator.transaction.{TransactionLog, TransactionMetadata, TransactionState, TxnTransitMetadata}
import org.apache.kafka.metadata.MetadataCache
import org.apache.kafka.server.common.{FinalizedFeatures, MetadataVersion, RequestLocal, TransactionVersion}
import org.apache.kafka.server.common.TransactionVersion.{TV_0, TV_2}
Expand Down Expand Up @@ -918,11 +918,11 @@ class TransactionStateManagerTest {
batches.foreach { records =>
records.records.forEach { record =>
TransactionLog.readTxnRecordKey(record.key) match {
case Right(transactionalId) =>
case transactionalId: String =>
assertNull(record.value)
expiredTransactionalIds += transactionalId
assertEquals(Right(None), transactionManager.getTransactionState(transactionalId))
case Left(value) => fail(s"Failed to read transactional id from tombstone: $value")
case value => fail(s"Failed to read transactional id from tombstone: $value")
}
}
}
Expand Down Expand Up @@ -1184,7 +1184,7 @@ class TransactionStateManagerTest {
val partitionId = transactionManager.partitionFor(transactionalId1)
val topicPartition = new TopicIdPartition(transactionTopicId, partitionId, TRANSACTION_STATE_TOPIC_NAME)
val expectedTombstone = new SimpleRecord(time.milliseconds(), TransactionLog.keyToBytes(transactionalId1), null)
val expectedRecords = MemoryRecords.withRecords(TransactionLog.EnforcedCompression, expectedTombstone)
val expectedRecords = MemoryRecords.withRecords(TransactionLog.ENFORCED_COMPRESSION, expectedTombstone)
assertEquals(Set(topicPartition), appendedRecords.keySet)
assertEquals(Seq(expectedRecords), appendedRecords(topicPartition).toSeq)
} else {
Expand Down
Loading