Skip to content

KAFKA-20712: Fix transaction state name in log decoder output #22615

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
fvaleri wants to merge 1 commit into
base: trunk
Choose a base branch
from
+21 −6
Open

KAFKA-20712: Fix transaction state name in log decoder output #22615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion tools/src/main/java/org/apache/kafka/tools/DumpLogSegments.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
import org.apache.kafka.coordinator.group.GroupCoordinatorRecordSerde;
import org.apache.kafka.coordinator.share.ShareCoordinatorRecordSerde;
import org.apache.kafka.coordinator.transaction.TransactionCoordinatorRecordSerde;
import org.apache.kafka.coordinator.transaction.TransactionState;
import org.apache.kafka.coordinator.transaction.generated.TransactionLogValue;
import org.apache.kafka.metadata.MetadataRecordSerde;
import org.apache.kafka.metadata.bootstrap.BootstrapMetadata;
import org.apache.kafka.server.common.ApiMessageAndVersion;
Expand Down Expand Up @@ -725,8 +727,13 @@ protected JsonNode keyAsJson(ApiMessage message) {

@Override
protected JsonNode valueAsJson(ApiMessage message, short version) {
return org.apache.kafka.coordinator.transaction.generated.CoordinatorRecordJsonConverters
JsonNode json = org.apache.kafka.coordinator.transaction.generated.CoordinatorRecordJsonConverters
.writeRecordValueAsJson(message, version);
if (message instanceof TransactionLogValue) {
((ObjectNode) json).put("transactionStatus",
TransactionState.fromId(((TransactionLogValue) message).transactionStatus()).stateName());
}
return json;
}
}

Expand Down
10 changes: 9 additions & 1 deletion tools/src/main/java/org/apache/kafka/tools/consumer/TransactionLogMessageFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@

import org.apache.kafka.common.protocol.ApiMessage;
import org.apache.kafka.coordinator.transaction.TransactionCoordinatorRecordSerde;
import org.apache.kafka.coordinator.transaction.TransactionState;
import org.apache.kafka.coordinator.transaction.generated.CoordinatorRecordJsonConverters;
import org.apache.kafka.coordinator.transaction.generated.TransactionLogValue;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;

public class TransactionLogMessageFormatter extends CoordinatorRecordMessageFormatter {
public TransactionLogMessageFormatter() {
Expand All @@ -39,6 +42,11 @@ protected JsonNode keyAsJson(ApiMessage message) {

@Override
protected JsonNode valueAsJson(ApiMessage message, short version) {
return CoordinatorRecordJsonConverters.writeRecordValueAsJson(message, version);
JsonNode json = CoordinatorRecordJsonConverters.writeRecordValueAsJson(message, version);
if (message instanceof TransactionLogValue) {
((ObjectNode) json).put("transactionStatus",
TransactionState.fromId(((TransactionLogValue) message).transactionStatus()).stateName());
}
return json;
}
}
4 changes: 2 additions & 2 deletions tools/src/test/java/org/apache/kafka/tools/DumpLogSegmentsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ public void testTransactionLogMessageParser() {
)),
Optional.of("{\"type\":\"0\",\"data\":{\"transactionalId\":\"txnId\"}}"),
Optional.of("{\"version\":\"0\",\"data\":{\"producerId\":123,\"producerEpoch\":0,\"transactionTimeoutMs\":0," +
"\"transactionStatus\":0,\"transactionPartitions\":[],\"transactionLastUpdateTimestampMs\":0," +
"\"transactionStatus\":\"Empty\",\"transactionPartitions\":[],\"transactionLastUpdateTimestampMs\":0," +
"\"transactionStartTimestampMs\":0}}")
);

Expand Down Expand Up @@ -1047,7 +1047,7 @@ public void testTransactionLogMessageParser() {
)),
Optional.of("{\"type\":\"0\",\"data\":{\"transactionalId\":\"txnId\"}}"),
Optional.of("{\"version\":\"1\",\"data\":{\"producerId\":12,\"previousProducerId\":11,\"nextProducerId\":10," +
"\"producerEpoch\":2,\"transactionTimeoutMs\":14,\"transactionStatus\":0," +
"\"producerEpoch\":2,\"transactionTimeoutMs\":14,\"transactionStatus\":\"Empty\"," +
"\"transactionPartitions\":[{\"topic\":\"topic1\",\"partitionIds\":[0,1,2]}," +
"{\"topic\":\"topic2\",\"partitionIds\":[3,4,5]}],\"transactionLastUpdateTimestampMs\":123," +
"\"transactionStartTimestampMs\":13}}")
Expand Down
4 changes: 2 additions & 2 deletions tools/src/test/java/org/apache/kafka/tools/consumer/TransactionLogMessageFormatterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ protected Stream<Arguments> parameters() {
"data":{"producerId":100,
"producerEpoch":50,
"transactionTimeoutMs":500,
"transactionStatus":4,
"transactionStatus":"CompleteCommit",
"transactionPartitions":[],
"transactionLastUpdateTimestampMs":1000,
"transactionStartTimestampMs":750}}}
Expand All @@ -75,7 +75,7 @@ protected Stream<Arguments> parameters() {
"data":{"producerId":100,
"producerEpoch":50,
"transactionTimeoutMs":500,
"transactionStatus":4,
"transactionStatus":"CompleteCommit",
"transactionPartitions":[],
"transactionLastUpdateTimestampMs":1000,
"transactionStartTimestampMs":750}}}
Expand Down
Loading