V3.3.2 #1

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.

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

sixtus wants to merge 179 commits into trunk from v3.3.2

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,6 @@ systest/ @@
     *.swp
     jmh-benchmarks/generated
     jmh-benchmarks/src/main/generated
-    raft/.jqwik-database
+    **/.jqwik-database
     **/src/generated
     **/src/generated-test

Jenkinsfile

-Original file line number
+Diff line change
@@ Expand Up / @@ -29,15 +29,10 @@ def isChangeRequest(env) { @@
       env.CHANGE_ID != null && !env.CHANGE_ID.isEmpty()
     }
-    def retryFlagsString(env) {
-        if (isChangeRequest(env)) " -PmaxTestRetries=1 -PmaxTestRetryFailures=5"
-        else ""
-    }
     def doTest(env, target = "unitTest integrationTest") {
       sh """./gradlew -PscalaVersion=$SCALA_VERSION ${target} \
           --profile --no-daemon --continue -PtestLoggingEvents=started,passed,skipped,failed \
-          -PignoreFailures=true -PmaxParallelForks=2""" + retryFlagsString(env)
+          -PignoreFailures=true -PmaxParallelForks=2 -PmaxTestRetries=1 -PmaxTestRetryFailures=10"""
       junit '**/build/test-results/**/TEST-*.xml'
     }
@@ Expand Down Expand Up / @@ -160,72 +155,6 @@ pipeline { @@
                 echo 'Skipping Kafka Streams archetype test for Java 17'
               }
             }
-            stage('ARM') {
-              options {
-                timestamps()
-              }
-              environment {
-                SCALA_VERSION=2.12
-              }
-              stages {
-                stage('Check ARM Agent') {
-                  agent { label 'arm4' }
-                  options {
-                    timeout(time: 5, unit: 'MINUTES')
-                  }
-                  steps {
-                    echo 'ARM ok'
-                  }
-                }
-                stage('Run ARM Build') {
-                  agent { label 'arm4' }
-                  options {
-                    timeout(time: 2, unit: 'HOURS')
-                  }
-                  steps {
-                    doValidation()
-                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                      doTest(env, 'unitTest')
-                    }
-                    echo 'Skipping Kafka Streams archetype test for ARM build'
-                  }
-                }
-              }
-            }
-            stage('PowerPC') {
-              options {
-                timestamps()
-              }
-              environment {
-                SCALA_VERSION=2.12
-              }
-              stages {
-                stage('Check PowerPC Agent') {
-                  agent { label 'ppc64le' }
-                  options {
-                    timeout(time: 5, unit: 'MINUTES')
-                  }
-                  steps {
-                    echo 'PowerPC ok'
-                  }
-                }
-                stage('Run PowerPC Build') {
-                  agent { label 'ppc64le' }
-                  options {
-                    timeout(time: 2, unit: 'HOURS')
-                  }
-                  steps {
-                    doValidation()
-                    catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
-                      doTest(env, 'unitTest')
-                    }
-                    echo 'Skipping Kafka Streams archetype test for PowerPC build'
-                  }
-                }
-              }
-            }
             // To avoid excessive Jenkins resource usage, we only run the stages
             // above at the PR stage. The ones below are executed after changes
@@ Expand Down @@

LICENSE-binary

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -207,46 +207,47 @@ License Version 2.0:
  
    audience-annotations-0.5.0

    commons-cli-1.4

    commons-lang3-3.8.1

    jackson-annotations-2.12.6

    jackson-core-2.12.6

    jackson-databind-2.12.6.1

    jackson-dataformat-csv-2.12.6

    jackson-datatype-jdk8-2.12.6

    jackson-jaxrs-base-2.12.6

    jackson-jaxrs-json-provider-2.12.6

    jackson-module-jaxb-annotations-2.12.6

    jackson-module-paranamer-2.10.5

    jackson-module-scala_2.13-2.12.6

    commons-lang3-3.12.0

    jackson-annotations-2.13.4

    jackson-core-2.13.4

    jackson-databind-2.13.4.2

    jackson-dataformat-csv-2.13.4

    jackson-dataformat-yaml-2.13.4

    jackson-datatype-jdk8-2.13.4

    jackson-datatype-jsr310-2.13.4

    jackson-jaxrs-base-2.13.4

    jackson-jaxrs-json-provider-2.13.4

    jackson-module-jaxb-annotations-2.13.4

    jackson-module-scala_2.13-2.13.4

    jackson-module-scala_2.12-2.13.4

    jakarta.validation-api-2.0.2

    javassist-3.27.0-GA

    jetty-client-9.4.44.v20210927

    jetty-continuation-9.4.44.v20210927

    jetty-http-9.4.44.v20210927

    jetty-io-9.4.44.v20210927

    jetty-security-9.4.44.v20210927

    jetty-server-9.4.44.v20210927

    jetty-servlet-9.4.44.v20210927

    jetty-servlets-9.4.44.v20210927

    jetty-util-9.4.44.v20210927

    jetty-util-ajax-9.4.44.v20210927

    jetty-client-9.4.48.v20220622

    jetty-continuation-9.4.48.v20220622

    jetty-http-9.4.48.v20220622

    jetty-io-9.4.48.v20220622

    jetty-security-9.4.48.v20220622

    jetty-server-9.4.48.v20220622

    jetty-servlet-9.4.48.v20220622

    jetty-servlets-9.4.48.v20220622

    jetty-util-9.4.48.v20220622

    jetty-util-ajax-9.4.48.v20220622

    jersey-common-2.34

    jersey-server-2.34

    jose4j-0.7.9

    lz4-java-1.8.0

    maven-artifact-3.8.4

    metrics-core-4.1.12.1

    metrics-core-2.2.0

    netty-buffer-4.1.73.Final

    netty-codec-4.1.73.Final

    netty-common-4.1.73.Final

    netty-handler-4.1.73.Final

    netty-resolver-4.1.73.Final

    netty-tcnative-classes-2.0.46.Final

    netty-transport-4.1.73.Final

    netty-transport-classes-epoll-4.1.73.Final

    netty-transport-native-epoll-4.1.73.Final

    netty-transport-native-unix-common-4.1.73.Final

    netty-buffer-4.1.78.Final

    netty-codec-4.1.78.Final

    netty-common-4.1.78.Final

    netty-handler-4.1.78.Final

    netty-resolver-4.1.78.Final

    netty-transport-4.1.78.Final

    netty-transport-classes-epoll-4.1.78.Final

    netty-transport-native-epoll-4.1.78.Final

    netty-transport-native-unix-common-4.1.78.Final

    plexus-utils-3.3.0

    reload4j-1.2.19

    rocksdbjni-6.29.4.1

    @@ -255,7 +256,13 @@ scala-library-2.13.8
  
    scala-logging_2.13-3.9.4

    scala-reflect-2.13.8

    scala-java8-compat_2.13-1.0.2

    snakeyaml-1.30

    snappy-java-1.1.8.4

    swagger-annotations-2.2.0

    swagger-core-2.2.0

    swagger-integration-2.2.0

    swagger-jaxrs2-2.2.0

    swagger-models-2.2.0

    zookeeper-3.6.3

    zookeeper-jute-3.6.3

    @@ -268,8 +275,8 @@ See licenses/ for text of these licenses.
  
    Eclipse Distribution License - v 1.0

    see: licenses/eclipse-distribution-license-1.0

    jakarta.activation-api-1.2.1

    jakarta.xml.bind-api-2.3.2

    jakarta.activation-api-1.2.2

    jakarta.xml.bind-api-2.3.3

    ---------------------------------------

    Eclipse Public License - v 2.0

    @@ -305,6 +312,7 @@ argparse4j-0.7.0, see: licenses/argparse-MIT
  
    jopt-simple-5.0.4, see: licenses/jopt-simple-MIT

    slf4j-api-1.7.36, see: licenses/slf4j-MIT

    slf4j-reload4j-1.7.36, see: licenses/slf4j-MIT

    classgraph-4.8.138, see: license/classgraph-MIT

    ---------------------------------------

    BSD 2-Clause

README.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -83,15 +83,17 @@ fail due to code changes. You can just run: @@
         ./gradlew processMessages processTestMessages
+    ### Running a Kafka broker in KRaft mode
+        KAFKA_CLUSTER_ID="$(./bin/kafka-storage.sh random-uuid)"
+        ./bin/kafka-storage.sh format -t $KAFKA_CLUSTER_ID -c config/kraft/server.properties
+        ./bin/kafka-server-start.sh config/kraft/server.properties
     ### Running a Kafka broker in ZooKeeper mode
         ./bin/zookeeper-server-start.sh config/zookeeper.properties
         ./bin/kafka-server-start.sh config/server.properties
-    ### Running a Kafka broker in KRaft (Kafka Raft metadata) mode
-    See [config/kraft/README.md](https://github.com/apache/kafka/blob/trunk/config/kraft/README.md).
     ### Cleaning the build ###
         ./gradlew clean
@@ Expand Down @@

bin/kafka-metadata-quorum.sh

-Original file line number
+Diff line change
@@ -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 kafka.admin.MetadataQuorumCommand "$@"

bin/kafka-run-class.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -213,6 +213,10 @@ fi @@
     # JMX port to use
     if [  $JMX_PORT ]; then
       KAFKA_JMX_OPTS="$KAFKA_JMX_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT "
+      if ! echo "$KAFKA_JMX_OPTS" | grep -qF -- '-Dcom.sun.management.jmxremote.rmi.port=' ; then
+        # If unset, set the RMI port to address issues with monitoring Kafka running in containers
+        KAFKA_JMX_OPTS="$KAFKA_JMX_OPTS -Dcom.sun.management.jmxremote.rmi.port=$JMX_PORT"
+      fi
     fi
     # Log directory to use
@@ Expand Down @@

bin/windows/kafka-metatada-quorum.bat

-Original file line number
+Diff line change
@@ -0,0 +1,17 @@
+    @echo off
+    rem Licensed to the Apache Software Foundation (ASF) under one or more
+    rem contributor license agreements.  See the NOTICE file distributed with
+    rem this work for additional information regarding copyright ownership.
+    rem The ASF licenses this file to You under the Apache License, Version 2.0
+    rem (the "License"); you may not use this file except in compliance with
+    rem the License.  You may obtain a copy of the License at
+    rem
+    rem     http://www.apache.org/licenses/LICENSE-2.0
+    rem
+    rem Unless required by applicable law or agreed to in writing, software
+    rem distributed under the License is distributed on an "AS IS" BASIS,
+    rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    rem See the License for the specific language governing permissions and
+    rem limitations under the License.
+    "%~dp0kafka-run-class.bat" kafka.admin.MetadataQuorumCommand %*

build.gradle

-Original file line number
+Diff line change
@@ Expand Up / @@ -875,6 +875,7 @@ project(':core') { @@
         testImplementation project(':clients').sourceSets.test.output
         testImplementation project(':metadata').sourceSets.test.output
         testImplementation project(':raft').sourceSets.test.output
+        testImplementation project(':server-common').sourceSets.test.output
         testImplementation libs.bcpkix
         testImplementation libs.mockitoCore
         testImplementation(libs.apacheda) {
@@ Expand Down Expand Up / @@ -1151,12 +1152,14 @@ project(':metadata') { @@
         implementation libs.metrics
         compileOnly libs.log4j
         testImplementation libs.junitJupiter
+        testImplementation libs.jqwik
         testImplementation libs.hamcrest
         testImplementation libs.mockitoCore
         testImplementation libs.mockitoInline
         testImplementation libs.slf4jlog4j
         testImplementation project(':clients').sourceSets.test.output
         testImplementation project(':raft').sourceSets.test.output
+        testImplementation project(':server-common').sourceSets.test.output
         generator project(':generator')
       }
@@ Expand Down Expand Up / @@ -1595,6 +1598,8 @@ project(':storage') { @@
         testImplementation project(':clients').sourceSets.test.output
         testImplementation project(':core')
         testImplementation project(':core').sourceSets.test.output
+        testImplementation project(':server-common')
+        testImplementation project(':server-common').sourceSets.test.output
         testImplementation libs.junitJupiter
         testImplementation libs.mockitoCore
         testImplementation libs.bcpkix
@@ Expand Down Expand Up / @@ -1679,6 +1684,7 @@ project(':tools') { @@
       dependencies {
         implementation project(':clients')
+        implementation project(':server-common')
         implementation project(':log4j-appender')
         implementation libs.argparse4j
         implementation libs.jacksonDatabind
@@ Expand Down Expand Up / @@ -2534,9 +2540,10 @@ project(':connect:runtime') { @@
         implementation libs.jettyClient
         implementation libs.reflections
         implementation libs.mavenArtifact
-        implementation libs.swaggerJaxrs2
         implementation libs.swaggerAnnotations
+        compileOnly libs.swaggerJaxrs2
         testImplementation project(':clients').sourceSets.test.output
         testImplementation project(':core')
         testImplementation project(':metadata')
@@ Expand Down Expand Up / @@ -2624,7 +2631,8 @@ project(':connect:runtime') { @@
       }
       task genConnectOpenAPIDocs(type: io.swagger.v3.plugins.gradle.tasks.ResolveTask, dependsOn: setVersionInOpenAPISpec) {
-        classpath = sourceSets.main.runtimeClasspath
+        classpath = sourceSets.main.compileClasspath + sourceSets.main.runtimeClasspath
         buildClasspath = classpath
         outputFileName = 'connect_rest'
         outputFormat = 'YAML'
@@ Expand Down @@

checkstyle/checkstyle.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -143,9 +143,15 @@ @@
           <!-- default is 200 -->
           <property name="max" value="500"/>
         </module>
+        <!-- Allows the use of the @SuppressWarnings annotation in the code -->
+        <module name="SuppressWarningsHolder"/>
       </module>
       <module name="SuppressionFilter">
         <property name="file" value="${suppressionsFile}"/>
       </module>
+      <!-- Allows the use of the @SuppressWarnings annotation in the code -->
+      <module name="SuppressWarningsFilter"/>
     </module>

checkstyle/import-control-core.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,7 @@ @@
         <allow pkg="org.apache.kafka.metadata" />
         <allow pkg="org.apache.kafka.metalog" />
         <allow pkg="org.apache.kafka.server.common" />
+        <allow pkg="org.apache.kafka.server.fault" />
       </subpackage>
       <subpackage name="tools">
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

V3.3.2 #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

V3.3.2 #1

Are you sure you want to change the base?

Uh oh!

V3.3.2 #1

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!