You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by di...@apache.org on 2023/07/11 09:06:39 UTC
[kafka] branch 3.5 updated (031e300c69c -> d1af2832e64)
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a change to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
from 031e300c69c KAFKA-15145: Don't re-process records filtered out by SMTs on Kafka client retriable exceptions in AbstractWorkerSourceTask (#13955)
new f30d61b8891 [KAFKA-15137] Do not log entire request payload in KRaftControllerChannelManager (#13988)
new d1af2832e64 KAFKA-15159: upgrade minor dependencies (#13982)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
LICENSE-binary | 20 ++++++++++----------
.../common/requests/AbstractControlRequest.java | 12 ++++++++++++
.../kafka/controller/ControllerChannelManager.scala | 4 +++-
gradle/dependencies.gradle | 9 +++++----
4 files changed, 30 insertions(+), 15 deletions(-)
[kafka] 02/02: KAFKA-15159: upgrade minor dependencies (#13982)
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a commit to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit d1af2832e6493dca64c4943a7c1e35d29ca42e73
Author: ezio <ez...@gmail.com>
AuthorDate: Tue Jul 11 01:39:39 2023 -0700
KAFKA-15159: upgrade minor dependencies (#13982)
Reviewers: Divij Vaidya <di...@amazon.com>
---------
Co-authored-by: Damon Xie <da...@zoom.us>
---
LICENSE-binary | 20 ++++++++++----------
gradle/dependencies.gradle | 9 +++++----
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index ffddc94551b..1b6c66e4ea9 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -232,18 +232,18 @@ jetty-util-9.4.51.v20230217
jetty-util-ajax-9.4.51.v20230217
jose4j-0.9.3
lz4-java-1.8.0
-maven-artifact-3.8.4
+maven-artifact-3.8.8
metrics-core-4.1.12.1
metrics-core-2.2.0
-netty-buffer-4.1.92.Final
-netty-codec-4.1.92.Final
-netty-common-4.1.92.Final
-netty-handler-4.1.92.Final
-netty-resolver-4.1.92.Final
-netty-transport-4.1.92.Final
-netty-transport-classes-epoll-4.1.92.Final
-netty-transport-native-epoll-4.1.92.Final
-netty-transport-native-unix-common-4.1.92.Final
+netty-buffer-4.1.94.Final
+netty-codec-4.1.94.Final
+netty-common-4.1.94.Final
+netty-handler-4.1.94.Final
+netty-resolver-4.1.94.Final
+netty-transport-4.1.94.Final
+netty-transport-classes-epoll-4.1.94.Final
+netty-transport-native-epoll-4.1.94.Final
+netty-transport-native-unix-common-4.1.94.Final
plexus-utils-3.3.0
reload4j-1.2.25
rocksdbjni-7.1.2
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 6354d663de8..28d17ac1387 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -60,7 +60,7 @@ versions += [
apacheda: "1.0.2",
apacheds: "2.0.0-M24",
argparse4j: "0.7.0",
- bcpkix: "1.73",
+ bcpkix: "1.75",
checkstyle: "8.36.2",
commonsCli: "1.4",
dropwizardMetrics: "4.1.12.1",
@@ -85,7 +85,7 @@ versions += [
jopt: "5.0.4",
jose4j: "0.9.3",
junit: "5.9.3",
- jqwik: "1.7.2",
+ jqwik: "1.7.4",
kafka_0100: "0.10.0.1",
kafka_0101: "0.10.1.1",
kafka_0102: "0.10.2.2",
@@ -106,10 +106,10 @@ versions += [
kafka_32: "3.2.3",
kafka_33: "3.3.1",
lz4: "1.8.0",
- mavenArtifact: "3.8.4",
+ mavenArtifact: "3.8.8",
metrics: "2.2.0",
mockito: "4.9.0",
- netty: "4.1.92.Final",
+ netty: "4.1.94.Final",
powermock: "2.0.9",
reflections: "0.9.12",
reload4j: "1.2.25",
@@ -124,6 +124,7 @@ versions += [
slf4j: "1.7.36",
snappy: "1.1.10.1",
spotbugs: "4.7.3",
+ // New version of Swagger 2.2.14 requires minimum JDK 11.
swaggerAnnotations: "2.2.8",
swaggerJaxrs2: "2.2.8",
zinc: "1.8.0",
[kafka] 01/02: [KAFKA-15137] Do not log entire request payload in KRaftControllerChannelManager (#13988)
Posted by di...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
divijv pushed a commit to branch 3.5
in repository https://gitbox.apache.org/repos/asf/kafka.git
commit f30d61b88914319f522bd03bf9507dbfd9971d9a
Author: Alyssa Huang <ah...@confluent.io>
AuthorDate: Tue Jul 11 01:48:53 2023 -0700
[KAFKA-15137] Do not log entire request payload in KRaftControllerChannelManager (#13988)
Reviewers: David Arthur <mu...@gmail.com>
---
.../apache/kafka/common/requests/AbstractControlRequest.java | 12 ++++++++++++
.../scala/kafka/controller/ControllerChannelManager.scala | 4 +++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java b/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java
index 789a4abeaba..76342dd124a 100644
--- a/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java
+++ b/clients/src/main/java/org/apache/kafka/common/requests/AbstractControlRequest.java
@@ -41,6 +41,18 @@ public abstract class AbstractControlRequest extends AbstractRequest {
this.brokerEpoch = brokerEpoch;
this.kraftController = kraftController;
}
+
+ public int controllerId() {
+ return controllerId;
+ }
+
+ public int controllerEpoch() {
+ return controllerEpoch;
+ }
+
+ public long brokerEpoch() {
+ return brokerEpoch;
+ }
}
protected AbstractControlRequest(ApiKeys api, short version) {
diff --git a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
index 2d413a4eb20..6b63651336a 100755
--- a/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
+++ b/core/src/main/scala/kafka/controller/ControllerChannelManager.scala
@@ -91,7 +91,9 @@ class ControllerChannelManager(controllerEpoch: () => Int,
case Some(stateInfo) =>
stateInfo.messageQueue.put(QueueItem(request.apiKey, request, callback, time.milliseconds()))
case None =>
- warn(s"Not sending request $request to broker $brokerId, since it is offline.")
+ warn(s"Not sending request ${request.apiKey.name} with controllerId=${request.controllerId()}, " +
+ s"controllerEpoch=${request.controllerEpoch()}, brokerEpoch=${request.brokerEpoch()} " +
+ s"to broker $brokerId, since it is offline.")
}
}
}