Skip to content

KAFKA-20310: Persist previousProducerId and nextProducerId in transaction log #21828

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

Merged
jolshan merged 7 commits into from
Mar 28, 2026
+66 −5
Merged

KAFKA-20310: Persist previousProducerId and nextProducerId in transaction log #21828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f1df411
KAFKA-20310: Persist previousProducerId and nextProducerId in transac…
haltandcatchwater Mar 19, 2026
7b9e3c8
Remove unnecessary version guard for tagged fields
haltandcatchwater Mar 24, 2026
5f0fe04
Address review feedback: inline value, add nextProducerId assertion
haltandcatchwater Mar 25, 2026
3e376f9
Fix compile error: TransactionMetadata has no nextProducerId() accessor
haltandcatchwater Mar 25, 2026
1fa7fa3
Update v0 test: tagged fields persist at all versions
haltandcatchwater Mar 25, 2026
5934823
Restore version guard for previousProducerId/nextProducerId
haltandcatchwater Mar 26, 2026
5bbca40
Remove nextProducerId assertion — no public accessor on TransactionMe…
haltandcatchwater Mar 26, 2026
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
15 changes: 10 additions & 5 deletions ...on-coordinator/src/main/java/org/apache/kafka/coordinator/transaction/TransactionLog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,18 +84,23 @@ public static byte[] valueToBytes(TxnTransitMetadata txnMetadata,
.setPartitionIds(entry.getValue().stream().map(TopicPartition::partition).toList())).toList();
}

return MessageUtil.toVersionPrefixedBytes(
Copy link
Copy Markdown
Member

@jolshan jolshan Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can probably also still inline.

Copy link
Copy Markdown
Contributor Author

@haltandcatchwater haltandcatchwater Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done — inlined back into the return statement.

transactionVersionLevel.transactionLogValueVersion(),
new TransactionLogValue()
short logValueVersion = transactionVersionLevel.transactionLogValueVersion();
TransactionLogValue value = new TransactionLogValue()
.setProducerId(txnMetadata.producerId())
.setProducerEpoch(txnMetadata.producerEpoch())
.setTransactionTimeoutMs(txnMetadata.txnTimeoutMs())
.setTransactionStatus(txnMetadata.txnState().id())
.setTransactionLastUpdateTimestampMs(txnMetadata.txnLastUpdateTimestamp())
.setTransactionStartTimestampMs(txnMetadata.txnStartTimestamp())
.setTransactionPartitions(transactionPartitions)
.setClientTransactionVersion(txnMetadata.clientTransactionVersion().featureLevel())
);
.setClientTransactionVersion(txnMetadata.clientTransactionVersion().featureLevel());

if (logValueVersion >= 1) {
value.setPreviousProducerId(txnMetadata.prevProducerId());
value.setNextProducerId(txnMetadata.nextProducerId());
}

return MessageUtil.toVersionPrefixedBytes(logValueVersion, value);
}

/**
Expand Down
56 changes: 56 additions & 0 deletions ...oordinator/src/test/java/org/apache/kafka/coordinator/transaction/TransactionLogTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,62 @@ var record = MemoryRecords.withRecords(Compression.NONE, new SimpleRecord(
}
}

@Test
void shouldRoundTripPreviousAndNextProducerIds() {
var txnTransitMetadata = new TxnTransitMetadata(
200L, // producerId
100L, // prevProducerId
201L, // nextProducerId
(short) 5, // producerEpoch
(short) 4, // lastProducerEpoch
1000, // txnTimeoutMs
TransactionState.PREPARE_COMMIT,
new HashSet<>(Set.of(new TopicPartition("topic", 0))),
0L, // txnStartTimestamp
0L, // txnLastUpdateTimestamp
TV_2
);

// Serialize to bytes and deserialize the raw TransactionLogValue
var bytes = TransactionLog.valueToBytes(txnTransitMetadata, TV_2);
var buffer = wrap(bytes);
buffer.getShort(); // skip version prefix
var value = new TransactionLogValue(new ByteBufferAccessor(buffer), (short) 1);

assertEquals(200L, value.producerId());
assertEquals(100L, value.previousProducerId());
assertEquals(201L, value.nextProducerId());
}

@Test
void shouldNotPersistProducerIdsAtVersion0() {
// Version 0 is non-flexible, so tagged fields (previousProducerId,
// nextProducerId) cannot be written. They fall back to defaults (-1).
var txnTransitMetadata = new TxnTransitMetadata(
200L, // producerId
100L, // prevProducerId — not persisted at v0
201L, // nextProducerId — not persisted at v0
(short) 5, // producerEpoch
(short) 4, // lastProducerEpoch
1000, // txnTimeoutMs
TransactionState.PREPARE_COMMIT,
new HashSet<>(Set.of(new TopicPartition("topic", 0))),
0L, // txnStartTimestamp
0L, // txnLastUpdateTimestamp
TV_0
);

var record = MemoryRecords.withRecords(Compression.NONE, new SimpleRecord(
TransactionLog.keyToBytes("transactionalId"),
TransactionLog.valueToBytes(txnTransitMetadata, TV_0)
)).records().iterator().next();
var readResult = assertInstanceOf(TransactionLog.TxnRecord.class, TransactionLog.read(record.key(), record.value()));
var deserialized = readResult.metadata();

assertEquals(200L, deserialized.producerId());
assertEquals(-1L, deserialized.prevProducerId());
}

@Test
void testSerializeTransactionLogValueToHighestNonFlexibleVersion() {
var txnTransitMetadata = new TxnTransitMetadata(1L, 1L, 1L, (short) 1, (short) 1, 1000, TransactionState.COMPLETE_COMMIT, new HashSet<>(), 500L, 500L, TV_0);
Expand Down
Loading