Skip to content

Commit d1bd21a

Browse files
dengzimingdongjoon-hyun
authored andcommitted
[SPARK-45502][BUILD] Upgrade Kafka to 3.6.0
### What changes were proposed in this pull request? Upgrade Apache Kafka from 3.4.1 to 3.6.0 ### Why are the changes needed? - https://downloads.apache.org/kafka/3.6.0/RELEASE_NOTES.html - https://downloads.apache.org/kafka/3.5.1/RELEASE_NOTES.html - https://archive.apache.org/dist/kafka/3.5.0/RELEASE_NOTES.html ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? GitHub CI. ### Was this patch authored or co-authored using generative AI tooling? No Closes apache#43348 from dengziming/kafka-3.6.0. Authored-by: dengziming <dengziming1993@gmail.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
1 parent f0b2e6d commit d1bd21a

File tree

5 files changed

+26
-25
lines changed

5 files changed

+26
-25
lines changed

connector/kafka-0-10-sql/src/test/scala/org/apache/spark/sql/kafka010/KafkaTestUtils.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import scala.io.Source
2828
import scala.jdk.CollectionConverters._
2929

3030
import com.google.common.io.Files
31-
import kafka.api.Request
3231
import kafka.server.{HostedPartition, KafkaConfig, KafkaServer}
3332
import kafka.server.checkpoints.OffsetCheckpointFile
3433
import kafka.zk.KafkaZkClient
@@ -40,6 +39,7 @@ import org.apache.kafka.clients.producer._
4039
import org.apache.kafka.common.TopicPartition
4140
import org.apache.kafka.common.config.SaslConfigs
4241
import org.apache.kafka.common.network.ListenerName
42+
import org.apache.kafka.common.requests.FetchRequest
4343
import org.apache.kafka.common.security.auth.SecurityProtocol.{PLAINTEXT, SASL_PLAINTEXT}
4444
import org.apache.kafka.common.serialization.StringSerializer
4545
import org.apache.kafka.common.utils.SystemTime
@@ -597,7 +597,7 @@ class KafkaTestUtils(
597597
.getPartitionInfo(topic, partition) match {
598598
case Some(partitionState) =>
599599
zkClient.getLeaderForPartition(new TopicPartition(topic, partition)).isDefined &&
600-
Request.isValidBrokerId(partitionState.leader) &&
600+
FetchRequest.isValidBrokerId(partitionState.leader) &&
601601
!partitionState.replicas.isEmpty
602602

603603
case _ =>

connector/kafka-0-10/src/test/scala/org/apache/spark/streaming/kafka010/KafkaRDDSuite.scala

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@ import scala.concurrent.duration._
2424
import scala.jdk.CollectionConverters._
2525
import scala.util.Random
2626

27-
import kafka.log.{CleanerConfig, LogCleaner, LogConfig, ProducerStateManagerConfig, UnifiedLog}
28-
import kafka.server.{BrokerTopicStats, LogDirFailureChannel}
27+
import kafka.log.{LogCleaner, UnifiedLog}
28+
import kafka.server.BrokerTopicStats
2929
import kafka.utils.Pool
3030
import org.apache.kafka.common.TopicPartition
31+
import org.apache.kafka.common.config.TopicConfig
3132
import org.apache.kafka.common.record.{CompressionType, MemoryRecords, SimpleRecord}
3233
import org.apache.kafka.common.serialization.StringDeserializer
34+
import org.apache.kafka.storage.internals.log.{CleanerConfig, LogConfig, LogDirFailureChannel, ProducerStateManagerConfig}
3335
import org.scalatest.concurrent.Eventually.{eventually, interval, timeout}
3436

3537
import org.apache.spark._
@@ -90,13 +92,13 @@ class KafkaRDDSuite extends SparkFunSuite {
9092
val dir = new File(logDir, topic + "-" + partition)
9193
dir.mkdirs()
9294
val logProps = new ju.Properties()
93-
logProps.put(LogConfig.CleanupPolicyProp, LogConfig.Compact)
94-
logProps.put(LogConfig.MinCleanableDirtyRatioProp, java.lang.Float.valueOf(0.1f))
95+
logProps.put(TopicConfig.CLEANUP_POLICY_CONFIG, TopicConfig.CLEANUP_POLICY_COMPACT)
96+
logProps.put(TopicConfig.MIN_CLEANABLE_DIRTY_RATIO_CONFIG, java.lang.Float.valueOf(0.1f))
9597
val logDirFailureChannel = new LogDirFailureChannel(1)
9698
val topicPartition = new TopicPartition(topic, partition)
9799
val producerIdExpirationMs = Int.MaxValue
98-
val producerStateManagerConfig = new ProducerStateManagerConfig(producerIdExpirationMs)
99-
val logConfig = LogConfig(logProps)
100+
val producerStateManagerConfig = new ProducerStateManagerConfig(producerIdExpirationMs, false)
101+
val logConfig = new LogConfig(logProps)
100102
val log = UnifiedLog(
101103
dir,
102104
logConfig,
@@ -120,7 +122,7 @@ class KafkaRDDSuite extends SparkFunSuite {
120122
log.roll()
121123
logs.put(topicPartition, log)
122124

123-
val cleaner = new LogCleaner(CleanerConfig(), Array(dir), logs, logDirFailureChannel)
125+
val cleaner = new LogCleaner(new CleanerConfig(false), Array(dir), logs, logDirFailureChannel)
124126
cleaner.startup()
125127
cleaner.awaitCleaned(new TopicPartition(topic, partition), log.activeSegment.baseOffset, 1000)
126128

connector/kafka-0-10/src/test/scala/org/apache/spark/streaming/kafka010/KafkaTestUtils.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@ import scala.annotation.tailrec
2727
import scala.jdk.CollectionConverters._
2828
import scala.util.control.NonFatal
2929

30-
import kafka.api.Request
3130
import kafka.server.{KafkaConfig, KafkaServer}
3231
import kafka.zk.{AdminZkClient, KafkaZkClient}
3332
import org.apache.kafka.clients.producer.{KafkaProducer, ProducerRecord}
3433
import org.apache.kafka.common.TopicPartition
3534
import org.apache.kafka.common.network.ListenerName
35+
import org.apache.kafka.common.requests.FetchRequest
3636
import org.apache.kafka.common.serialization.StringSerializer
3737
import org.apache.kafka.common.utils.{Time => KTime}
3838
import org.apache.zookeeper.client.ZKClientConfig
@@ -304,7 +304,7 @@ private[kafka010] class KafkaTestUtils extends Logging {
304304
val leader = partitionState.leader
305305
val isr = partitionState.isr
306306
zkClient.getLeaderForPartition(new TopicPartition(topic, partition)).isDefined &&
307-
Request.isValidBrokerId(leader) && !isr.isEmpty
307+
FetchRequest.isValidBrokerId(leader) && !isr.isEmpty
308308
case _ =>
309309
false
310310
}

connector/kafka-0-10/src/test/scala/org/apache/spark/streaming/kafka010/mocks/MockScheduler.scala

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package org.apache.spark.streaming.kafka010.mocks
1919

2020
import java.util.concurrent.{ScheduledFuture, TimeUnit}
2121

22-
import kafka.utils.Scheduler
2322
import org.apache.kafka.common.utils.Time
23+
import org.apache.kafka.server.util.Scheduler
2424
import org.jmock.lib.concurrent.DeterministicScheduler
2525

2626
/**
@@ -42,8 +42,6 @@ private[kafka010] class MockScheduler(val time: Time) extends Scheduler {
4242

4343
val scheduler = new DeterministicScheduler()
4444

45-
def isStarted: Boolean = true
46-
4745
def startup(): Unit = {}
4846

4947
def shutdown(): Unit = synchronized {
@@ -56,17 +54,18 @@ private[kafka010] class MockScheduler(val time: Time) extends Scheduler {
5654

5755
def schedule(
5856
name: String,
59-
fun: () => Unit,
60-
delay: Long = 0,
61-
period: Long = -1,
62-
unit: TimeUnit = TimeUnit.MILLISECONDS): ScheduledFuture[_] = synchronized {
63-
val runnable = new Runnable {
64-
override def run(): Unit = fun()
65-
}
66-
if (period >= 0) {
67-
scheduler.scheduleAtFixedRate(runnable, delay, period, unit)
57+
task: Runnable,
58+
delayMs: Long = 0,
59+
periodMs: Long = -1): ScheduledFuture[_] = synchronized {
60+
if (periodMs >= 0) {
61+
scheduler.scheduleAtFixedRate(task, delayMs, periodMs, TimeUnit.MILLISECONDS)
6862
} else {
69-
scheduler.schedule(runnable, delay, unit)
63+
scheduler.schedule(task, delayMs, TimeUnit.MILLISECONDS)
7064
}
7165
}
66+
67+
override def resizeThreadPool(i: Int): Unit = {
68+
69+
}
70+
7271
}

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<!-- Version used for internal directory structure -->
138138
<hive.version.short>2.3</hive.version.short>
139139
<!-- note that this should be compatible with Kafka brokers version 0.10 and up -->
140-
<kafka.version>3.4.1</kafka.version>
140+
<kafka.version>3.6.0</kafka.version>
141141
<!-- After 10.15.1.3, the minimum required version is JDK9 -->
142142
<derby.version>10.14.2.0</derby.version>
143143
<parquet.version>1.13.1</parquet.version>

0 commit comments

Comments
 (0)