HOTFIX: Do not use highest version when version is valid (#19109)

Reviewers: Chia-Ping Tsai <[email protected]>
apache · Mar 6, 2025 · 50510bb · 50510bb
1 parent 56fc8e9
commit 50510bb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/clients/src/main/java/org/apache/kafka/common/record/EndTransactionMarker.java b/clients/src/main/java/org/apache/kafka/common/record/EndTransactionMarker.java
@@ -93,10 +93,12 @@ static EndTransactionMarker deserializeValue(ControlRecordType type, ByteBuffer
             throw new InvalidRecordException("Invalid version found for end transaction marker: " + version +
                     ". May indicate data corruption");
 
-        if (version > EndTxnMarker.HIGHEST_SUPPORTED_VERSION)
+        if (version > EndTxnMarker.HIGHEST_SUPPORTED_VERSION) {
             log.debug("Received end transaction marker value version {}. Parsing as version {}", version,
                     EndTxnMarker.HIGHEST_SUPPORTED_VERSION);
-        EndTxnMarker marker = new EndTxnMarker(new ByteBufferAccessor(value), EndTxnMarker.HIGHEST_SUPPORTED_VERSION);
+            version = EndTxnMarker.HIGHEST_SUPPORTED_VERSION;
+        }
+        EndTxnMarker marker = new EndTxnMarker(new ByteBufferAccessor(value), version);
         return new EndTransactionMarker(type, marker.coordinatorEpoch());
     }