Merge branch 'trunk' into minor-fix-chatty-logs

apache · Mar 6, 2025 · d660be7 · d660be7
2 parents d2826f6 + 041d801
commit d660be7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 296 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());
     }
 

diff --git a/core/src/main/scala/kafka/utils/json/DecodeJson.scala b/core/src/main/scala/kafka/utils/json/DecodeJson.scala
diff --git a/core/src/main/scala/kafka/utils/json/JsonArray.scala b/core/src/main/scala/kafka/utils/json/JsonArray.scala
diff --git a/core/src/main/scala/kafka/utils/json/JsonObject.scala b/core/src/main/scala/kafka/utils/json/JsonObject.scala
diff --git a/core/src/main/scala/kafka/utils/json/JsonValue.scala b/core/src/main/scala/kafka/utils/json/JsonValue.scala