Merge branch 'trunk' into kip1071merge/heartbeat_1

Author: lucasbru

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());
     }
 

core/src/main/scala/kafka/utils/json/DecodeJson.scala

@@ -3965,7 +3965,7 @@ <h5 class="anchor-heading"><a id="kraft_shell_tool" class="anchor-link"></a><a h
 
   <p>The kafka-metadata-shell.sh tool can be used to interactively inspect the state of the cluster metadata partition:</p>
 
-  <pre><code class="language-bash">$ bin/kafka-metadata-shell.sh --snapshot metadata_log_dir/__cluster_metadata-0/00000000000000000000.checkpoint
+  <pre><code class="language-bash">$ bin/kafka-metadata-shell.sh --snapshot metadata_log_dir/__cluster_metadata-0/00000000000000007228-0000000001.checkpoint
 &gt;&gt; ls /
 brokers  local  metadataQuorum  topicIds  topics
 &gt;&gt; ls /topics
@@ -3983,7 +3983,7 @@ <h5 class="anchor-heading"><a id="kraft_shell_tool" class="anchor-link"></a><a h
   "partitionEpoch" : 0
 }
 &gt;&gt; exit</code></pre>
-
+  Note: <code>00000000000000000000-0000000000.checkpoint</code> does not contain cluster metadata. Use a valid snapshot file when examining metadata with the <code>kafka-metadata-shell.sh</code> tool.
   <h4 class="anchor-heading"><a id="kraft_deployment" class="anchor-link"></a><a href="#kraft_deployment">Deploying Considerations</a></h4>
 
   <ul>

core/src/main/scala/kafka/utils/json/JsonArray.scala

@@ -37,9 +37,9 @@ <h4><a id="upgrade_4_0_0" href="#upgrade_4_0_0">Upgrading to 4.0.0 from any vers
     <li>Upgrade the brokers one at a time: shut down the broker, update the code, and restart it. Once you have done so, the
         brokers will be running the latest version and you can verify that the cluster's behavior and performance meets expectations.
     </li>
-    <li>Once the cluster's behavior and performance has been verified, bump the metadata.version by running
+    <li>Once the cluster's behavior and performance has been verified, finalize the upgrade by running
         <code>
-            bin/kafka-features.sh upgrade --metadata 4.0
+            bin/kafka-features.sh upgrade --release-version 4.0
         </code>
     </li>
     <li>Note that cluster metadata downgrade is not supported in this version since it has metadata changes.