Skip to content

KAFKA-19446: Add transaction version field [1/3] #20857

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
merged 4 commits into from
Nov 12, 2025
Merged

KAFKA-19446: Add transaction version field [1/3] #20857

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
0e008fb
add field to json
rreddy-22 Nov 7, 2025
e8ef82b
remove hard coded versioning in the builder
rreddy-22 Nov 7, 2025
9279ee9
Address comments
rreddy-22 Nov 10, 2025
1780c93
Merge remote-tracking branch 'upstream/trunk' into KIP-1228-pt-1-Add-…
rreddy-22 Nov 12, 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
3 changes: 2 additions & 1 deletion clients/src/main/java/org/apache/kafka/common/requests/WriteTxnMarkersRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ public Builder(WriteTxnMarkersRequestData data) {
}

public Builder(final List<TxnMarkerEntry> markers) {
super(ApiKeys.WRITE_TXN_MARKERS, (short) 1); // if we add new versions, gate them behind metadata version
// version will be determined at build time based on broker capabilities
super(ApiKeys.WRITE_TXN_MARKERS);
List<WritableTxnMarker> dataMarkers = new ArrayList<>();
for (TxnMarkerEntry marker : markers) {
final Map<String, WritableTxnMarkerTopic> topicMap = new HashMap<>();
Expand Down
7 changes: 5 additions & 2 deletions clients/src/main/resources/common/message/WriteTxnMarkersRequest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
// Version 0 was removed in Apache Kafka 4.0, Version 1 is the new baseline.
//
// Version 1 enables flexible versions.
"validVersions": "1",
// Version 2 adds TransactionVersion field to the WritableTxnMarker (KIP-1228).
"validVersions": "1-2",
"flexibleVersions": "1+",
"fields": [
{ "name": "Markers", "type": "[]WritableTxnMarker", "versions": "0+",
Expand All @@ -40,7 +41,9 @@
"about": "The indexes of the partitions to write transaction markers for." }
]},
{ "name": "CoordinatorEpoch", "type": "int32", "versions": "0+",
"about": "Epoch associated with the transaction state partition hosted by this transaction coordinator." }
"about": "Epoch associated with the transaction state partition hosted by this transaction coordinator." },
{ "name": "TransactionVersion", "type": "int8", "versions": "2+", "ignorable": true,
"about": "Transaction version of the marker. Ex: 0/1 = legacy (TV0/TV1), 2 = TV2 etc.", "default": "0" }
]}
]
}
3 changes: 2 additions & 1 deletion clients/src/main/resources/common/message/WriteTxnMarkersResponse.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
"apiKey": 27,
"type": "response",
"name": "WriteTxnMarkersResponse",
"validVersions": "1",
"validVersions": "1-2",
// Version 0 was removed in Apache Kafka 4.0, Version 1 is the new baseline.
//
// Version 1 enables flexible versions.
// Version 2 matches WriteTxnMarkersRequest version 2 (KIP-1228).
"flexibleVersions": "1+",
"fields": [
{ "name": "Markers", "type": "[]WritableTxnMarkerResult", "versions": "0+",
Expand Down