Merge remote-tracking branch 'upstream/trunk' into KAFKA-19082-Client-Side-2PC-Changes-pt1

Author: rreddy-22

.asf.yaml

@@ -29,16 +29,16 @@ notifications:
 # Read more here: https://github.com/apache/infrastructure-asfyaml
 github:
   collaborators:
-    - apoorvmittal10
     - brandboat
-    - frankvicky
     - FrankYang0529
     - gongxuanzhang
     - m1a2st
     - mingyen066
+    - ShivsundarR
     - smjn
     - TaiJuWu
     - xijiu
+    - Yunyung
   enabled_merge_buttons:
     squash: true
     squash_commit_message: PR_TITLE_AND_DESC

.github/scripts/pr-format.py

@@ -22,9 +22,9 @@
 import shlex
 import sys
 import tempfile
+import textwrap
 from typing import Dict, Optional, TextIO
 
-
 logger = logging.getLogger()
 logger.setLevel(logging.DEBUG)
 handler = logging.StreamHandler(sys.stderr)
@@ -61,6 +61,7 @@ def write_commit(io: TextIO, title: str, body: str):
     io.write(body.encode())
     io.flush()
 
+
 def parse_trailers(title, body) -> Dict:
     trailers = defaultdict(list)
 
@@ -77,6 +78,29 @@ def parse_trailers(title, body) -> Dict:
     return trailers
 
 
+def split_paragraphs(text: str):
+    """
+    Split the given text into a generator of paragraph lines and a boolean "markdown" flag.
+
+    If any line of a paragraph starts with a markdown character, we will assume the whole paragraph
+    contains markdown.
+    """
+    lines = text.splitlines(keepends=True)
+    paragraph = []
+    markdown = False
+    for line in lines:
+        if line.strip() == "":
+            if len(paragraph) > 0:
+                yield paragraph, markdown
+                paragraph.clear()
+                markdown = False
+        else:
+            if line[0] in ("#", "*", "-", "=") or line[0].isdigit():
+                markdown = True
+            paragraph.append(line)
+    yield paragraph, markdown
+
+
 if __name__ == "__main__":
     """
     This script performs some basic linting of our PR titles and body. The PR number is read from the PR_NUMBER
@@ -96,10 +120,6 @@ def parse_trailers(title, body) -> Dict:
     * Has "Reviewers:" trailer if the PR is approved
     """
 
-    if not get_env("GITHUB_ACTIONS"):
-        print("This script is intended to by run by GitHub Actions.")
-        exit(1)
-
     pr_number = get_env("PR_NUMBER")
     cmd = f"gh pr view {pr_number} --json 'title,body,reviews'"
     p = subprocess.run(shlex.split(cmd), capture_output=True)
@@ -132,6 +152,35 @@ def check(positive_assertion, ok_msg, err_msg):
     check("Delete this text and replace" not in body, "PR template text not present", "PR template text should be removed")
     check("Committer Checklist" not in body, "PR template text not present", "Old PR template text should be removed")
 
+    paragraph_iter = split_paragraphs(body)
+    new_paragraphs = []
+    for p, markdown in paragraph_iter:
+        if markdown:
+            # If a paragraph looks like it has markdown in it, wrap each line separately.
+            new_lines = []
+            for line in p:
+                new_lines.append(textwrap.fill(line, width=72, break_long_words=False, break_on_hyphens=False, replace_whitespace=False))
+            rewrapped_p = "\n".join(new_lines)
+        else:
+            indent = ""
+            if len(p) > 0 and p[0].startswith("Reviewers:"):
+                indent = " "
+            rewrapped_p = textwrap.fill("".join(p), subsequent_indent=indent, width=72, break_long_words=False, break_on_hyphens=False, replace_whitespace=True)
+        new_paragraphs.append(rewrapped_p + "\n")
+    body = "\n".join(new_paragraphs)
+
+    if get_env("GITHUB_ACTIONS"):
+        with tempfile.NamedTemporaryFile() as fp:
+            fp.write(body.encode())
+            fp.flush()
+            cmd = f"gh pr edit {pr_number} --body-file {fp.name}"
+            p = subprocess.run(shlex.split(cmd), capture_output=True)
+            fp.close()
+            if p.returncode != 0:
+                logger.error(f"Could not update PR {pr_number}. STDOUT: {p.stdout.decode()}")
+    else:
+        logger.info(f"Not reformatting {pr_number} since this is not running on GitHub Actions.")
+
     # Check for Reviewers
     approved = has_approval(reviews)
     if approved:
@@ -143,12 +192,13 @@ def check(positive_assertion, ok_msg, err_msg):
                 logger.debug(reviewer_in_body)
 
     logger.debug("Commit will look like:\n")
-    logger.debug("```")
+    logger.debug("<pre>")
     io = BytesIO()
+    title += f" (#{pr_number})"
     write_commit(io, title, body)
     io.seek(0)
     logger.debug(io.read().decode())
-    logger.debug("```\n")
+    logger.debug("</pre>\n")
 
     exit_code = 0
     logger.debug("Validation results:")

README.md

@@ -99,6 +99,8 @@ fail due to code changes. You can just run:
 
     ./gradlew processMessages processTestMessages
 
+See [Apache Kafka Message Definitions](clients/src/main/resources/common/message/README.md) for details on Apache Kafka message protocol.
+
 ### Running a Kafka broker
 
 Using compiled files:
@@ -109,7 +111,9 @@ Using compiled files:
 
 Using docker image:
 
-    docker run -p 9092:9092 apache/kafka:3.7.0
+    docker run -p 9092:9092 apache/kafka:latest
+
+See [docker/README.md](docker/README.md) for detailed information.
 
 ### Cleaning the build ###
     ./gradlew clean
@@ -263,10 +267,28 @@ default. See https://www.lightbend.com/blog/scala-inliner-optimizer for more det
 
 See [tests/README.md](tests/README.md).
 
+### Using Trogdor for testing ###
+
+We use Trogdor as a test framework for Apache Kafka. You can use it to run benchmarks and other workloads.
+
+See [trogdor/README.md](trogdor/README.md).
+
 ### Running in Vagrant ###
 
 See [vagrant/README.md](vagrant/README.md).
 
+### Release Kafka ###
+
+See [release/README.md](release/README.md).
+
+### Official Documentation ###
+
+See [docs/README.md](docs/README.md).
+
+### Kafka client examples ###
+
+See [examples/README.md](examples/README.md).
+
 ### Contribution ###
 
 Apache Kafka is interested in building the community; we would welcome any thoughts or [patches](https://issues.apache.org/jira/browse/KAFKA). You can reach us [on the Apache mailing lists](http://kafka.apache.org/contact.html).

bin/kafka-streams-groups.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+# 
+#    http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+exec $(dirname $0)/kafka-run-class.sh org.apache.kafka.tools.streams.StreamsGroupCommand "$@"

build.gradle

@@ -3737,7 +3737,7 @@ project(':connect:mirror') {
     testImplementation project(':core')
     testImplementation project(':test-common:test-common-runtime')
     testImplementation project(':server')
-    testImplementation project(':server-common').sourceSets.test.output
+    testImplementation project(':server-common')
 
 
     testRuntimeOnly project(':connect:runtime')

checkstyle/import-control-clients-integration-tests.xml

@@ -19,12 +19,16 @@
 -->
 
 <import-control pkg="org.apache.kafka">
-  <allow pkg="java" />
-  <allow pkg="org.junit" />
+    <allow pkg="java"/>
+    <allow pkg="org.junit"/>
 
-  <!-- These are tests, allow whatever -->
-  <allow pkg="org.apache.kafka"/>
-  <allow pkg="org.junit" />
-  <allow pkg="kafka"/>
+    <!-- These are tests, allow whatever -->
+    <allow pkg="org.apache.kafka"/>
+    <allow pkg="org.junit"/>
+    <allow pkg="kafka"/>
+
+    <subpackage name="clients.producer">
+        <allow pkg="org.opentest4j"/>
+    </subpackage>
 
 </import-control>

checkstyle/import-control-metadata.xml

@@ -176,6 +176,9 @@
             <allow pkg="org.apache.kafka.controller" />
             <allow pkg="org.apache.kafka.metadata" />
             <allow pkg="org.apache.kafka.common.internals" />
+            <allow pkg="org.apache.kafka.common.metrics" />
+            <allow pkg="org.apache.kafka.common.metrics.internals" />
+            <allow pkg="org.apache.kafka.common.metrics.stats" />
         </subpackage>
         <subpackage name="bootstrap">
             <allow pkg="org.apache.kafka.snapshot" />

checkstyle/import-control-server-common.xml

@@ -38,7 +38,7 @@
     <disallow pkg="kafka" />
 
     <!-- anyone can use public classes -->
-    <allow pkg="org.apache.kafka.common" exact-match="true" />
+    <allow pkg="org.apache.kafka.common" />
     <allow pkg="org.apache.kafka.common.security" />
     <allow pkg="org.apache.kafka.common.serialization" />
     <allow pkg="org.apache.kafka.common.utils" />
@@ -130,6 +130,7 @@
         </subpackage>
         <subpackage name="config">
             <allow pkg="org.apache.kafka.server"/>
+            <allow pkg="org.apache.kafka.clients"/>
         </subpackage>
     </subpackage>
 

checkstyle/import-control-server.xml

@@ -59,6 +59,7 @@
   <allow pkg="org.apache.kafka.metadata" />
 
   <!-- utilities and reusable classes from server-common -->
+  <allow pkg="org.apache.kafka.config"/>
   <allow pkg="org.apache.kafka.queue" />
   <allow pkg="org.apache.kafka.security" />
   <allow pkg="org.apache.kafka.server.common" />
@@ -81,8 +82,10 @@
   <allow pkg="org.apache.kafka.raft" />
 
   <subpackage name="server">
+    <allow pkg="javax.crypto" />
     <allow pkg="org.apache.kafka.server" />
     <allow pkg="org.apache.kafka.image" />
+    <allow pkg="org.apache.kafka.network.metrics" />
     <allow pkg="org.apache.kafka.storage.internals.log" />
     <allow pkg="org.apache.kafka.storage.internals.checkpoint" />
     <subpackage name="metrics">
@@ -102,6 +105,7 @@
   <subpackage name="security">
     <allow pkg="org.apache.kafka.common.resource" />
     <allow pkg="org.apache.kafka.network" />
+    <allow pkg="org.apache.kafka.server" />
     <allow pkg="org.apache.kafka.server.authorizer" />
   </subpackage>
 

checkstyle/import-control-storage.xml

@@ -49,7 +49,11 @@
 
 
     <subpackage name="server">
+        <allow pkg="com.yammer.metrics.core" />
         <allow pkg="org.apache.kafka.common" />
+        <allow pkg="org.apache.kafka.server.metrics" />
+        <allow pkg="org.apache.kafka.server.util.timer" />
+        <allow pkg="org.apache.kafka.storage.internals.log" />
 
         <subpackage name="log">
             <allow pkg="com.fasterxml.jackson" />
@@ -84,6 +88,7 @@
         <allow pkg="com.fasterxml.jackson" />
         <allow pkg="com.yammer.metrics.core" />
         <allow pkg="org.apache.kafka.common" />
+        <allow pkg="org.apache.kafka.config" />
         <allow pkg="org.apache.kafka.server"/>
         <allow pkg="org.apache.kafka.storage.internals"/>
         <allow pkg="org.apache.kafka.storage.log.metrics"/>